diff options
49 files changed, 753 insertions, 716 deletions
diff --git a/CHANGES b/CHANGES index aad6ffcd..6cbb7e1c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,23 @@ Changes since Lynx 2.8 release ================================================================================ +1998-10-14 (2.8.1pre.10) ++ add/use HTSYS_purge and HTSYS_remove functions (based on report by Tony + Bolton and patch by BJP dealing with removing older versions of cookie files) + - TD +* add --disable-config-info option - TD +* change configure script --enable-forms-options to --disable-forms-options, + add --disable-menu-options - TD +* comment-out FM's code to fold cookie headers and force cookies to be presented + in the same order that they were received - BJP +* use full "Implementation" directory name in include path in WWW djgpp + makefile - DK +* use HTDOS_name() to force DOS temporary-directory into consistent form - DK +* include HTVMSUtils.h and HTDOS.h from LYUtils.h, consolidate some ifdef's + using macro HTSYS_name - TD +* another fix for HTTCP.c, for lookups with Lynx/32 - WB +* add fallback to $TMPDIR for Lynx temporary directory on Unix - TD +* remove verbose_links variable due to popular demand - TD 1998-10-10 (2.8.1pre.9) * add verbose_links variable to lynx.cfg and userdefs.h to control whether Lynx should show "(LINK)" before links (request/patch by Moshe Zadka diff --git a/INSTALLATION b/INSTALLATION index 103b61fc..608cd5ba 100644 --- a/INSTALLATION +++ b/INSTALLATION @@ -157,6 +157,11 @@ II. Compile instructions -- UNIX order shown by the -help option is different. See "docs/README.defines" for information on defines for which there are no option switches. + --disable-config-info (define NO_CONFIG_INFO) + Use this option to disable the browsable configuration information + (screens that show the result of the configuration script, as well + as a pointer to the lynx.cfg file). + --disable-dired (define DIRED_SUPPORT) Use this option to disable the optional directory-editor. @@ -217,6 +222,13 @@ II. Compile instructions -- UNIX disable extended HTML DTD logic. This should revert to old-style (2.7.1/2.7.2) behavior, but is not well-tested. + --disable-forms-options (define NO_OPTION_FORMS) + Disable the forms-based options screen. (See --disable-menu-options). + Please note that a few users with broken curses may have problems with + popup forms fields. The default behaviour is to compile both forms and + menu options code with FORMS_OPTIONS switch in lynx.cfg, or + -forms_options command-line switch. + --disable-full-paths Use this option to control whether full utility pathnames are used. By default, configure substitutes full pathnames. @@ -224,6 +236,13 @@ II. Compile instructions -- UNIX --disable-long-list (prevent defining LONG_LIST) Use this option to disable long "ls -l" directory listings. + --disable-menu-options (define NO_OPTION_MENU) + Disable the menu-style options screen. (See --disable-forms-options). + Please note that a few users with broken curses may have problems with + popup forms fields. The default behaviour is to compile both styles + options menu code with FORMS_OPTIONS switch in lynx.cfg, or + -forms_options command-line switch. + --disable-parent-dir-refs (define NO_PARENT_DIR_REFERENCE) Use this option to disable "Up-to" parent-links in directory listings. @@ -264,12 +283,6 @@ II. Compile instructions -- UNIX fonts) according to the current Display Character Set. (Linux console only. *Use with discretion.* See docs/README.chartrans.) - --enable-forms-options (define EXP_FORMS_OPTIONS) - Use forms-based options screen only. - Please note that a few users with broken curses may have problems - with popup forms fields. (The default behaviour is to compile - both styles options menu code with FORMS_OPTIONS switch in lynx.cfg). - --enable-internal-links (define DONT_TRACK_INTERNAL_LINKS) Disabled by default, this option allows tracking of internal links, a feature which could, however, compromise a secure transaction by diff --git a/LYHelp.hin b/LYHelp.hin index dc798611..fabab118 100644 --- a/LYHelp.hin +++ b/LYHelp.hin @@ -9,6 +9,7 @@ #define DOWNLOAD_OPTIONS_HELP "@LYNX_USERS_GUIDE@#RemoteSource" #define HISTORY_PAGE_HELP "keystrokes/@HISTORY_HELP@" #define LIST_PAGE_HELP "keystrokes/@FOLLOW_HELP@" +#define LYNXCFG_HELP "lynx.cfg" #define OPTIONS_HELP "keystrokes/@OPTION_HELP@" #define PRINT_OPTIONS_HELP "keystrokes/@PRINT_HELP@" #define UPLOAD_OPTIONS_HELP "@LYNX_USERS_GUIDE@#DirEd" diff --git a/LYMessages_en.h b/LYMessages_en.h index 67e49b08..bdefbc80 100644 --- a/LYMessages_en.h +++ b/LYMessages_en.h @@ -478,14 +478,14 @@ #define MAP_NOT_ACCESSIBLE "Client-side image MAP is not accessible!" #define MAPS_NOT_AVAILABLE "No client-side image MAPs are available!" #define MAP_NOT_AVAILABLE "Client-side image MAP is not available!" -#ifndef EXP_FORMS_OPTIONS +#ifndef NO_OPTION_MENU #define OPTION_SCREEN_NEEDS_24 \ "Screen height must be at least 24 lines for the Options menu!" #define OPTION_SCREEN_NEEDS_23 \ "Screen height must be at least 23 lines for the Options menu!" #define OPTION_SCREEN_NEEDS_22 \ "Screen height must be at least 22 lines for the Options menu!" -#endif /* !EXP_FORMS_OPTIONS */ +#endif /* !NO_OPTION_MENU */ #define NEED_ADVANCED_USER_MODE "That key requires Advanced User mode." #define COMMAND_PROMPT "Command: " #define SELECT_SEGMENT "Select " diff --git a/WWW/Library/Implementation/HTAccess.c b/WWW/Library/Implementation/HTAccess.c index 9bf69d38..12b17d54 100644 --- a/WWW/Library/Implementation/HTAccess.c +++ b/WWW/Library/Implementation/HTAccess.c @@ -63,6 +63,7 @@ #include <GridText.h> #include <LYGlobalDefs.h> #include <LYexit.h> +#include <LYUtils.h> #include <LYLeaks.h> extern HTCJKlang HTCJK; diff --git a/WWW/Library/Implementation/HTFWriter.c b/WWW/Library/Implementation/HTFWriter.c index f30461c9..8bccb379 100644 --- a/WWW/Library/Implementation/HTFWriter.c +++ b/WWW/Library/Implementation/HTFWriter.c @@ -16,6 +16,7 @@ #include <HTAlert.h> #include <HTFile.h> +#include <LYUtils.h> #include <LYLeaks.h> /* Stream Object diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c index 70936cf3..d04b2013 100644 --- a/WWW/Library/Implementation/HTFile.c +++ b/WWW/Library/Implementation/HTFile.c @@ -52,10 +52,6 @@ #define INFINITY 512 /* file name length @@ FIXME */ #define MULTI_SUFFIX ".multi" /* Extension for scanning formats */ -#ifdef VMS -#include <HTVMSUtils.h> -#endif /* VMS */ - #include <HTParse.h> #include <HTTCP.h> #ifndef DECNET diff --git a/WWW/Library/Implementation/HTFinger.c b/WWW/Library/Implementation/HTFinger.c index 0932b4d2..91b8d40e 100644 --- a/WWW/Library/Implementation/HTFinger.c +++ b/WWW/Library/Implementation/HTFinger.c @@ -34,6 +34,7 @@ #include <HTString.h> #include <HTFinger.h> +#include <LYUtils.h> #include <LYLeaks.h> #define FINGER_PORT 79 /* See rfc742 */ diff --git a/WWW/Library/Implementation/HTGopher.c b/WWW/Library/Implementation/HTGopher.c index 8c7855ca..d6790693 100644 --- a/WWW/Library/Implementation/HTGopher.c +++ b/WWW/Library/Implementation/HTGopher.c @@ -68,6 +68,7 @@ #include <HTML.h> #include <LYStrings.h> +#include <LYUtils.h> #include <LYLeaks.h> #define PUTC(c) (*targetClass.put_character)(target, c) diff --git a/WWW/Library/Implementation/HTNews.c b/WWW/Library/Implementation/HTNews.c index 2b547783..331b4fa7 100644 --- a/WWW/Library/Implementation/HTNews.c +++ b/WWW/Library/Implementation/HTNews.c @@ -15,6 +15,7 @@ #include <HTCJK.h> #include <HTMIME.h> #include <HTTCP.h> +#include <LYUtils.h> /* this define should be in HTFont.h :( */ #define HT_NON_BREAK_SPACE ((char)1) /* For now */ @@ -893,12 +894,7 @@ PRIVATE void post_article ARGS1( } } fclose(fd); -#ifdef VMS - while (remove(postfile) == 0) - ; /* loop through all versions */ -#else - remove(postfile); -#endif /* VMS */ + HTSYS_remove(postfile); /* ** Send the nntp EOF and get the server's response. - FM @@ -2351,12 +2347,7 @@ PRIVATE int HTLoadNews ARGS4( FREE(ProxyHREF); FREE(ListArg); if (postfile) { -#ifdef VMS - while (remove(postfile) == 0) - ; /* loop through all versions */ -#else - remove(postfile); -#endif /* VMS */ + HTSYS_remove(postfile); FREE(postfile); } return HT_NOT_LOADED; @@ -2375,12 +2366,7 @@ PRIVATE int HTLoadNews ARGS4( FREE(ProxyHREF); FREE(ListArg); if (postfile) { -#ifdef VMS - while (remove(postfile) == 0) - ; /* loop through all versions */ -#else - remove(postfile); -#endif /* VMS */ + HTSYS_remove(postfile); FREE(postfile); } return HTLoadError(stream, 500, message); @@ -2409,12 +2395,7 @@ PRIVATE int HTLoadNews ARGS4( FREE(ProxyHREF); FREE(ListArg); if (postfile) { -#ifdef VMS - while (remove(postfile) == 0) - ; /* loop through all versions */ -#else - remove(postfile); -#endif /* VMS */ + HTSYS_remove(postfile); FREE(postfile); } return(HT_NOT_LOADED); @@ -2441,12 +2422,7 @@ PRIVATE int HTLoadNews ARGS4( } FREE(ListArg); if (postfile) { -#ifdef VMS - while (remove(postfile) == 0) - ; /* loop through all versions */ -#else - remove(postfile); -#endif /* VMS */ + HTSYS_remove(postfile); FREE(postfile); } return(HT_NOT_LOADED); @@ -2467,12 +2443,7 @@ PRIVATE int HTLoadNews ARGS4( } FREE(ListArg); if (postfile) { -#ifdef VMS - while (remove(postfile) == 0) - ; /* loop through all versions */ -#else - remove(postfile); -#endif /* VMS */ + HTSYS_remove(postfile); FREE(postfile); } return(HT_NOT_LOADED); @@ -2617,12 +2588,7 @@ Send_NNTP_command: if (status != 340) { HTAlert("Cannot POST to this host."); if (postfile) { -#ifdef VMS - while (remove(postfile) == 0) - ; /* loop through all versions */ -#else - remove(postfile); -#endif /* VMS */ + HTSYS_remove(postfile); } } else { post_article(postfile); @@ -2684,12 +2650,7 @@ Send_NNTP_command: } FREE(ListArg); if (postfile) { -#ifdef VMS - while (remove(postfile) == 0) - ; /* loop through all versions */ -#else - remove(postfile); -#endif /* VMS */ + HTSYS_remove(postfile); FREE(postfile); } return status; @@ -2712,12 +2673,7 @@ Send_NNTP_command: } FREE(ListArg); if (postfile) { -#ifdef VMS - while (remove(postfile) == 0) - ; /* loop through all versions */ -#else - remove(postfile); -#endif /* VMS */ + HTSYS_remove(postfile); FREE(postfile); } return HT_NOT_LOADED; diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c index 05cce142..f83334c7 100644 --- a/WWW/Library/Implementation/HTTCP.c +++ b/WWW/Library/Implementation/HTTCP.c @@ -117,11 +117,14 @@ extern int sys_nerr; #ifdef _WINDOWS_NSL char host[512]; - struct hostent *phost; /* Pointer to host - See netdb.h */ + struct hostent *phost; /* Pointer to host - See netdb.h */ + int donelookup; unsigned long _fork_func (void *arglist) { - return (unsigned long)(phost = gethostbyname(host)); + phost = gethostbyname(host); + donelookup = TRUE; + return (unsigned long)(phost); } #endif /* _WINDOWS_NSL */ @@ -642,7 +645,9 @@ PUBLIC int HTParseInet ARGS2( if (!hThread) MessageBox((void *)NULL, "CreateThread", "CreateThread Failed", 0L); - while (!phost) + + donelookup = FALSE; + while (!donelookup) if (HTCheckForInterrupt()) { /* Note that host is a character array and is not freed */ @@ -653,6 +658,8 @@ PUBLIC int HTParseInet ARGS2( return HT_INTERRUPTED; }; }; + if (!phost) goto failed; + memcpy((void *)&soc_in->sin_addr, phost->h_addr, phost->h_length); #else /* !NSL_FORK, !DJGPP, !_WINDOWS_NSL: */ { struct hostent *phost; @@ -680,8 +687,6 @@ PUBLIC int HTParseInet ARGS2( #endif /* !NSL_FORK */ #ifndef _WINDOWS_NSL FREE(host); -#else - memcpy((void *)&soc_in->sin_addr, phost->h_addr, phost->h_length); #endif /* _WINDOWS_NSL */ } diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c index 5d2a9642..4d128c81 100644 --- a/WWW/Library/Implementation/HTTP.c +++ b/WWW/Library/Implementation/HTTP.c @@ -7,8 +7,8 @@ */ #include <HTUtils.h> - #include <HTTP.h> +#include <LYUtils.h> #define HTTP_VERSION "HTTP/1.0" diff --git a/WWW/Library/Implementation/HTVMSUtils.c b/WWW/Library/Implementation/HTVMSUtils.c index d2e981a9..7f49ff67 100644 --- a/WWW/Library/Implementation/HTVMSUtils.c +++ b/WWW/Library/Implementation/HTVMSUtils.c @@ -30,6 +30,7 @@ #include <starlet.h> #include <rmsdef.h> +#include <LYUtils.h> #include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} @@ -1245,3 +1246,33 @@ PUBLIC int HTVMSBrowseDir ARGS4( return HT_LOADED; } /* End of directory reading section */ + +/* + * Remove all versions of the given file. We assume there are no permissions + * problems, since we do this mainly for removing temporary files. + */ +int HTVMS_remove(char *filename) +{ + int code = remove(filename); /* return the first status code */ + while (remove(filename) == 0) + ; + return code; +} + +/* + * Remove all older versions of the given file. We may fail to remove some + * version due to permissions -- the loop stops either at that point, or when + * we run out of older versions to remove. + */ +void HTVMS_purge(char *filename) +{ + char *older_file = 0; + + StrAllocCopy(older_file, filename); + StrAllocCat(older_file, ";-1"); + + while (remove(older_file) == 0) + ; + + FREE(older_file); +} diff --git a/WWW/Library/Implementation/HTVMSUtils.h b/WWW/Library/Implementation/HTVMSUtils.h index da6b9432..25fd5adb 100644 --- a/WWW/Library/Implementation/HTVMSUtils.h +++ b/WWW/Library/Implementation/HTVMSUtils.h @@ -111,4 +111,7 @@ PUBLIC int HTVMSBrowseDir PARAMS(( HTFormat format_out, HTStream * sink)); +extern int HTVMS_remove(char *filename); +extern void HTVMS_purge(char *filename); + #endif /* not HTVMSUTIL_H */ diff --git a/WWW/Library/djgpp/makefile b/WWW/Library/djgpp/makefile index 57c02e85..71408d21 100644 --- a/WWW/Library/djgpp/makefile +++ b/WWW/Library/djgpp/makefile @@ -8,7 +8,7 @@ WWW_MACH = djgpp #ASIS_MACH = hardware/os CFLAGS = -O3 -DUSE_ZLIB -DDOSPATH -DNOUSERS -DDEBUG -DDISP_PARTIAL \ --I../implemen \ +-I../Implementation \ -I../../../djgpp/tcplib/include \ -I../../../djgpp/tcplib/include/tcp \ -I../../../src \ diff --git a/config.hin b/config.hin index c4ef9a4b..787f8b71 100644 --- a/config.hin +++ b/config.hin @@ -20,7 +20,6 @@ #undef EXEC_LINKS /* CF_ARG_ENABLE(exec-links) */ #undef EXEC_SCRIPTS /* CF_ARG_ENABLE(exec-scripts) */ #undef EXP_CHARTRANS_AUTOSWITCH /* AC_ARG_ENABLE(font-switch) */ -#undef EXP_FORMS_OPTIONS /* AC_ARG_ENABLE(forms-options) */ #undef EXP_PERSISTENT_COOKIES /* AC_ARG_ENABLE(persistent-cookies) */ #undef FANCY_CURSES /* defined by CF_FANCY_CURSES */ #undef GCC_UNUSED /* CF_GCC_ATTRIBUTES */ @@ -80,7 +79,10 @@ #undef NEED_REMOVE /* defined by CF_REMOVE_BROKEN */ #undef NGROUPS /* defined by CF_NGROUPS */ #undef NO_CHANGE_EXECUTE_PERMS /* CF_ARG_DISABLE(dired-xpermit) */ +#undef NO_CONFIG_INFO /* CF_ARG_DISABLE(config-info) */ #undef NO_EXTENDED_HTMLDTD /* CF_ARG_DISABLE(extended-dtd) */ +#undef NO_OPTION_FORMS /* CF_ARG_DISABLE(forms-options) */ +#undef NO_OPTION_MENU /* CF_ARG_DISABLE(option-menu) */ #undef NO_PARENT_DIR_REFERENCE /* configure --disable-parent-dir */ #undef NSL_FORK /* CF_ARG_ENABLE(nsl-fork) */ #undef OK_GZIP /* CF_ARG_DISABLE(dired-gzip) */ diff --git a/configure b/configure index 03fe0aa8..62ea0814 100755 --- a/configure +++ b/configure @@ -195,10 +195,12 @@ Basic Configuration Options: --with-screen=XXX select screen type (XXX is curses (default), ncurses or slang) Miscellaneous Options: - --enable-forms-options use experimental forms-based options (default: off) - --enable-persistent-cookies use experimental persistent-cookie support (default: off) + --disable-forms-options disable experimental forms-based options (default: on) + --disable-menu-options disable old-style option menu (default: on) EOF cat <<EOF + --disable-config-info disable browsable configuration-info (default: on) + --enable-persistent-cookies use experimental persistent-cookie support (default: off) --enable-color-style use optional/experimental color style (default: off) --disable-partial use partial-display logic (default: on) --enable-default-colors enable use of default-colors (ncurses/slang) (default: off) @@ -209,10 +211,10 @@ cat <<EOF --enable-exec-links support cgi links w/o a http daemon (default: off) --enable-exec-scripts support cgi links w/o a http daemon (default: off) --enable-internal-links handle following links to same doc differently (default: off) - --enable-nsl-fork fork NSL requests, allowing them to be aborted (default: off) - --enable-syslog log URL requests via syslog (default: off) EOF cat <<EOF + --enable-nsl-fork fork NSL requests, allowing them to be aborted (default: off) + --enable-syslog log URL requests via syslog (default: off) --enable-underlines underline links rather than using boldface (default: off) --enable-gzip-help install gzip'ed help files (default: off) --with-zlib use zlib for decompression of some gzip files @@ -223,10 +225,10 @@ Directory Editor Options: --disable-dired-permit disable chmod/attrib commands (default: on) --disable-dired-xpermit disable chmod/attrib commands (default: on) --disable-dired-tar disable "tar" command (default: on) - --disable-dired-uudecode disable "uudecode" command (default: on) - --disable-dired-zip disable "zip", "unzip" commands (default: on) EOF cat <<EOF + --disable-dired-uudecode disable "uudecode" command (default: on) + --disable-dired-zip disable "zip", "unzip" commands (default: on) --disable-dired-gzip disable "gzip", "gunzip" commands (default: on) --disable-long-list disable long "ls -l" directory listings (default: on) --disable-parent-dir-refs @@ -596,7 +598,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:600: checking host system type" >&5 +echo "configure:602: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -621,7 +623,7 @@ echo "$ac_t""$host" 1>&6 # 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:625: checking for $ac_word" >&5 +echo "configure:627: 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 @@ -650,7 +652,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:654: checking for $ac_word" >&5 +echo "configure:656: 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 @@ -698,7 +700,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:702: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:704: 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. @@ -708,11 +710,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 712 "configure" +#line 714 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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 @@ -732,12 +734,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:736: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:738: 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:741: checking whether we are using GNU C" >&5 +echo "configure:743: 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 @@ -746,7 +748,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:750: \"$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:752: \"$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 @@ -761,7 +763,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:765: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:767: 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 @@ -789,7 +791,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:793: checking how to run the C preprocessor" >&5 +echo "configure:795: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -804,13 +806,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 808 "configure" +#line 810 "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:814: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:816: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -821,13 +823,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 825 "configure" +#line 827 "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:831: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -852,7 +854,7 @@ echo "$ac_t""$CPP" 1>&6 # 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:856: checking for $ac_word" >&5 +echo "configure:858: 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 @@ -879,7 +881,7 @@ else fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:883: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:885: 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 @@ -907,7 +909,7 @@ fi echo $ac_n "checking for style of include in makefiles""... $ac_c" 1>&6 -echo "configure:911: checking for style of include in makefiles" >&5 +echo "configure:913: checking for style of include in makefiles" >&5 make_include_left="" make_include_right="" @@ -968,7 +970,7 @@ echo "$ac_t""${make_include_left}file${make_include_right}" 1>&6 # 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:972: checking for a BSD compatible install" >&5 +echo "configure:974: 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 @@ -1022,7 +1024,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:1026: checking for $ac_word" >&5 +echo "configure:1028: 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 @@ -1052,9 +1054,9 @@ done echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:1056: checking for AIX" >&5 +echo "configure:1058: checking for AIX" >&5 cat > conftest.$ac_ext <<EOF -#line 1058 "configure" +#line 1060 "configure" #include "confdefs.h" #ifdef _AIX yes @@ -1076,7 +1078,7 @@ rm -f conftest* echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:1080: checking for POSIXized ISC" >&5 +echo "configure:1082: 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 @@ -1102,7 +1104,7 @@ fi echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6 -echo "configure:1106: checking if you want to see long compiling messages" >&5 +echo "configure:1108: 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 @@ -1150,7 +1152,7 @@ fi echo $ac_n "checking if you want to check memory-leaks""... $ac_c" 1>&6 -echo "configure:1154: checking if you want to check memory-leaks" >&5 +echo "configure:1156: 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 @@ -1174,7 +1176,7 @@ EOF echo $ac_n "checking if you want to enable debug-code""... $ac_c" 1>&6 -echo "configure:1178: checking if you want to enable debug-code" >&5 +echo "configure:1180: 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 @@ -1219,7 +1221,7 @@ fi if test -n "$GCC" then echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6 -echo "configure:1223: checking if you want to turn on gcc warnings" >&5 +echo "configure:1225: 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 @@ -1259,9 +1261,9 @@ EOF if test -n "$GCC" then echo "checking for gcc __attribute__ directives" 1>&6 -echo "configure:1263: checking for gcc __attribute__ directives" >&5 +echo "configure:1265: checking for gcc __attribute__ directives" >&5 cat > conftest.$ac_ext <<EOF -#line 1265 "configure" +#line 1267 "configure" #include "confdefs.h" #include "conftest.h" #include "conftest.i" @@ -1299,7 +1301,7 @@ EOF EOF ;; esac - if { (eval echo configure:1303: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:1305: \"$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 @@ -1316,11 +1318,11 @@ fi if test -n "$GCC" then cat > conftest.$ac_ext <<EOF -#line 1320 "configure" +#line 1322 "configure" int main(int argc, char *argv[]) { return argv[argc-1] == 0; } EOF echo "checking for gcc warning options" 1>&6 -echo "configure:1324: checking for gcc warning options" >&5 +echo "configure:1326: checking for gcc warning options" >&5 cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-W -Wall" cf_warn_CONST="" @@ -1338,7 +1340,7 @@ echo "configure:1324: checking for gcc warning options" >&5 Wstrict-prototypes $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:1342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:1344: \"$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" @@ -1356,7 +1358,7 @@ fi echo $ac_n "checking if you want full utility pathnames""... $ac_c" 1>&6 -echo "configure:1360: checking if you want full utility pathnames" >&5 +echo "configure:1362: 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 @@ -1377,7 +1379,7 @@ echo "$ac_t""$with_full_paths" 1>&6 echo $ac_n "checking for system mailer""... $ac_c" 1>&6 -echo "configure:1381: checking for system mailer" >&5 +echo "configure:1383: 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 @@ -1404,7 +1406,7 @@ EOF echo $ac_n "checking system mail flags""... $ac_c" 1>&6 -echo "configure:1408: checking system mail flags" >&5 +echo "configure:1410: 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 @@ -1432,7 +1434,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:1436: checking for $ac_word" >&5 +echo "configure:1438: 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 @@ -1463,7 +1465,7 @@ fi else echo $ac_n "checking for chmod""... $ac_c" 1>&6 -echo "configure:1467: checking for chmod" >&5 +echo "configure:1469: checking for chmod" >&5 echo "$ac_t""$CHMOD" 1>&6 fi @@ -1505,7 +1507,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:1509: checking for $ac_word" >&5 +echo "configure:1511: 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 @@ -1536,7 +1538,7 @@ fi else echo $ac_n "checking for compress""... $ac_c" 1>&6 -echo "configure:1540: checking for compress" >&5 +echo "configure:1542: checking for compress" >&5 echo "$ac_t""$COMPRESS" 1>&6 fi @@ -1578,7 +1580,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:1582: checking for $ac_word" >&5 +echo "configure:1584: 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 @@ -1609,7 +1611,7 @@ fi else echo $ac_n "checking for cp""... $ac_c" 1>&6 -echo "configure:1613: checking for cp" >&5 +echo "configure:1615: checking for cp" >&5 echo "$ac_t""$COPY" 1>&6 fi @@ -1651,7 +1653,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:1655: checking for $ac_word" >&5 +echo "configure:1657: 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 @@ -1682,7 +1684,7 @@ fi else echo $ac_n "checking for gzip""... $ac_c" 1>&6 -echo "configure:1686: checking for gzip" >&5 +echo "configure:1688: checking for gzip" >&5 echo "$ac_t""$GZIP" 1>&6 fi @@ -1724,7 +1726,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:1728: checking for $ac_word" >&5 +echo "configure:1730: 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 @@ -1755,7 +1757,7 @@ fi else echo $ac_n "checking for mkdir""... $ac_c" 1>&6 -echo "configure:1759: checking for mkdir" >&5 +echo "configure:1761: checking for mkdir" >&5 echo "$ac_t""$MKDIR" 1>&6 fi @@ -1797,7 +1799,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:1801: checking for $ac_word" >&5 +echo "configure:1803: 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 @@ -1828,7 +1830,7 @@ fi else echo $ac_n "checking for mv""... $ac_c" 1>&6 -echo "configure:1832: checking for mv" >&5 +echo "configure:1834: checking for mv" >&5 echo "$ac_t""$MV" 1>&6 fi @@ -1870,7 +1872,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:1874: checking for $ac_word" >&5 +echo "configure:1876: 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 @@ -1901,7 +1903,7 @@ fi else echo $ac_n "checking for rm""... $ac_c" 1>&6 -echo "configure:1905: checking for rm" >&5 +echo "configure:1907: checking for rm" >&5 echo "$ac_t""$RM" 1>&6 fi @@ -1943,7 +1945,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:1947: checking for $ac_word" >&5 +echo "configure:1949: 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 @@ -1974,7 +1976,7 @@ fi else echo $ac_n "checking for tar""... $ac_c" 1>&6 -echo "configure:1978: checking for tar" >&5 +echo "configure:1980: checking for tar" >&5 echo "$ac_t""$TAR" 1>&6 fi @@ -2016,7 +2018,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:2020: checking for $ac_word" >&5 +echo "configure:2022: 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 @@ -2047,7 +2049,7 @@ fi else echo $ac_n "checking for touch""... $ac_c" 1>&6 -echo "configure:2051: checking for touch" >&5 +echo "configure:2053: checking for touch" >&5 echo "$ac_t""$TOUCH" 1>&6 fi @@ -2089,7 +2091,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:2093: checking for $ac_word" >&5 +echo "configure:2095: 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 @@ -2120,7 +2122,7 @@ fi else echo $ac_n "checking for gunzip""... $ac_c" 1>&6 -echo "configure:2124: checking for gunzip" >&5 +echo "configure:2126: checking for gunzip" >&5 echo "$ac_t""$UNCOMPRESS" 1>&6 fi @@ -2162,7 +2164,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:2166: checking for $ac_word" >&5 +echo "configure:2168: 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 @@ -2193,7 +2195,7 @@ fi else echo $ac_n "checking for unzip""... $ac_c" 1>&6 -echo "configure:2197: checking for unzip" >&5 +echo "configure:2199: checking for unzip" >&5 echo "$ac_t""$UNZIP" 1>&6 fi @@ -2235,7 +2237,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:2239: checking for $ac_word" >&5 +echo "configure:2241: 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 @@ -2266,7 +2268,7 @@ fi else echo $ac_n "checking for uudecode""... $ac_c" 1>&6 -echo "configure:2270: checking for uudecode" >&5 +echo "configure:2272: checking for uudecode" >&5 echo "$ac_t""$UUDECODE" 1>&6 fi @@ -2308,7 +2310,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:2312: checking for $ac_word" >&5 +echo "configure:2314: 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 @@ -2339,7 +2341,7 @@ fi else echo $ac_n "checking for zcat""... $ac_c" 1>&6 -echo "configure:2343: checking for zcat" >&5 +echo "configure:2345: checking for zcat" >&5 echo "$ac_t""$ZCAT" 1>&6 fi @@ -2381,7 +2383,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:2385: checking for $ac_word" >&5 +echo "configure:2387: 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 @@ -2412,7 +2414,7 @@ fi else echo $ac_n "checking for zip""... $ac_c" 1>&6 -echo "configure:2416: checking for zip" >&5 +echo "configure:2418: checking for zip" >&5 echo "$ac_t""$ZIP" 1>&6 fi @@ -2473,7 +2475,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:2477: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:2479: 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 @@ -2497,7 +2499,7 @@ for cf_arg in "-DCC_HAS_PROTOS" \ do CFLAGS="$cf_save_CFLAGS $cf_arg" cat > conftest.$ac_ext <<EOF -#line 2501 "configure" +#line 2503 "configure" #include "confdefs.h" #ifndef CC_HAS_PROTOS @@ -2513,7 +2515,7 @@ int main() { struct s2 {int (*f) (double a);}; ; return 0; } EOF -if { (eval echo configure:2517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ansi_cc="$cf_arg"; break else @@ -2541,12 +2543,12 @@ fi fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2545: checking for working const" >&5 +echo "configure:2547: 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 2550 "configure" +#line 2552 "configure" #include "confdefs.h" int main() { @@ -2595,7 +2597,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:2599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2637,7 +2639,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:2641: checking for strcmp in -lc_s" >&5 +echo "configure:2643: 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 @@ -2645,7 +2647,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_s $LIBS" cat > conftest.$ac_ext <<EOF -#line 2649 "configure" +#line 2651 "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 @@ -2656,7 +2658,7 @@ int main() { strcmp() ; return 0; } EOF -if { (eval echo configure:2660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2745,7 +2747,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:2749: checking for $ac_word" >&5 +echo "configure:2751: 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 @@ -2789,17 +2791,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:2793: checking for $ac_hdr" >&5 +echo "configure:2795: 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 2798 "configure" +#line 2800 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2805: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2843,17 +2845,17 @@ ultrix*) do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2847: checking for $ac_hdr" >&5 +echo "configure:2849: 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 2852 "configure" +#line 2854 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2857: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2859: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2891,16 +2893,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:2895: checking if we should use compile options $TRY_CFLAGS" >&5 +echo "configure:2897: checking if we should use compile options $TRY_CFLAGS" >&5 cat > conftest.$ac_ext <<EOF -#line 2897 "configure" +#line 2899 "configure" #include "confdefs.h" #include <stdio.h> int main() { FILE *fp = stdin ; return 0; } EOF -if { (eval echo configure:2904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_result=yes else @@ -2918,7 +2920,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:2922: checking if you want socks library" >&5 +echo "configure:2924: 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 @@ -2938,7 +2940,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:2942: checking if you want socks5 library" >&5 +echo "configure:2944: 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 @@ -3004,7 +3006,7 @@ cat >> confdefs.h <<\EOF EOF cat > conftest.$ac_ext <<EOF -#line 3008 "configure" +#line 3010 "configure" #include "confdefs.h" #include <stdio.h> @@ -3013,7 +3015,7 @@ int main() { accept((char *)0) ; return 0; } EOF -if { (eval echo configure:3017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then : else echo "configure: failed program was:" >&5 @@ -3043,9 +3045,9 @@ cat >> confdefs.h <<\EOF EOF echo $ac_n "checking if the socks library uses socks4 prefix""... $ac_c" 1>&6 -echo "configure:3047: checking if the socks library uses socks4 prefix" >&5 +echo "configure:3049: checking if the socks library uses socks4 prefix" >&5 cat > conftest.$ac_ext <<EOF -#line 3049 "configure" +#line 3051 "configure" #include "confdefs.h" #include <socks.h> @@ -3054,7 +3056,7 @@ int main() { Rinit((char *)0) ; return 0; } EOF -if { (eval echo configure:3058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cat >> confdefs.h <<\EOF #define USE_SOCKS4_PREFIX 1 @@ -3066,14 +3068,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 3070 "configure" +#line 3072 "configure" #include "confdefs.h" #include <socks.h> int main() { SOCKSinit((char *)0) ; return 0; } EOF -if { (eval echo configure:3077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_use_socks4=no else @@ -3142,7 +3144,7 @@ else cf_test_netlibs=no echo $ac_n "checking for network libraries""... $ac_c" 1>&6 -echo "configure:3146: checking for network libraries" >&5 +echo "configure:3148: checking for network libraries" >&5 if eval "test \"`echo '$''{'cf_cv_netlibs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3153,12 +3155,12 @@ cf_test_netlibs=yes for ac_func in gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3157: checking for $ac_func" >&5 +echo "configure:3159: 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 3162 "configure" +#line 3164 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3181,7 +3183,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3204,7 +3206,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:3208: checking for gethostname in -lnsl" >&5 +echo "configure:3210: 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 @@ -3212,7 +3214,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 3216 "configure" +#line 3218 "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 @@ -3223,7 +3225,7 @@ int main() { gethostname() ; return 0; } EOF -if { (eval echo configure:3227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3256,7 +3258,7 @@ else echo $ac_n "checking for gethostname in -lsocket""... $ac_c" 1>&6 -echo "configure:3260: checking for gethostname in -lsocket" >&5 +echo "configure:3262: 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 @@ -3264,7 +3266,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 3268 "configure" +#line 3270 "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 @@ -3275,7 +3277,7 @@ int main() { gethostname() ; return 0; } EOF -if { (eval echo configure:3279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3319,21 +3321,21 @@ done # FIXME: sequent needs this library (i.e., -lsocket -linet -lnsl), but # I don't know the entrypoints - 97/7/22 TD echo $ac_n "checking for -linet""... $ac_c" 1>&6 -echo "configure:3323: checking for -linet" >&5 +echo "configure:3325: checking for -linet" >&5 if eval "test \"`echo '$''{'ac_cv_lib_inet'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <<EOF -#line 3330 "configure" +#line 3332 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_lib_inet=yes else @@ -3356,12 +3358,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:3360: checking for $ac_func" >&5 +echo "configure:3362: 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 3365 "configure" +#line 3367 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3384,7 +3386,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3407,7 +3409,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:3411: checking for socket in -lsocket" >&5 +echo "configure:3413: 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 @@ -3415,7 +3417,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 3419 "configure" +#line 3421 "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 @@ -3426,7 +3428,7 @@ int main() { socket() ; return 0; } EOF -if { (eval echo configure:3430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3459,7 +3461,7 @@ else echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6 -echo "configure:3463: checking for socket in -lbsd" >&5 +echo "configure:3465: 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 @@ -3467,7 +3469,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 3471 "configure" +#line 3473 "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 @@ -3478,7 +3480,7 @@ int main() { socket() ; return 0; } EOF -if { (eval echo configure:3482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3523,12 +3525,12 @@ fi for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3527: checking for $ac_func" >&5 +echo "configure:3529: 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 3532 "configure" +#line 3534 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3551,7 +3553,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3574,7 +3576,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:3578: checking for gethostbyname in -lnsl" >&5 +echo "configure:3580: 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 @@ -3582,7 +3584,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 3586 "configure" +#line 3588 "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 @@ -3593,7 +3595,7 @@ int main() { gethostbyname() ; return 0; } EOF -if { (eval echo configure:3597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3634,12 +3636,12 @@ done for ac_func in strcasecmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3638: checking for $ac_func" >&5 +echo "configure:3640: 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 3643 "configure" +#line 3645 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3662,7 +3664,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3685,7 +3687,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6 -echo "configure:3689: checking for strcasecmp in -lresolv" >&5 +echo "configure:3691: 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 @@ -3693,7 +3695,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 3697 "configure" +#line 3699 "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 @@ -3704,7 +3706,7 @@ int main() { strcasecmp() ; return 0; } EOF -if { (eval echo configure:3708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3750,7 +3752,7 @@ test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&6 fi echo $ac_n "checking for screen type""... $ac_c" 1>&6 -echo "configure:3754: checking for screen type" >&5 +echo "configure:3756: checking for screen type" >&5 if eval "test \"`echo '$''{'cf_cv_screen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3785,12 +3787,12 @@ case $cf_cv_screen in curses) echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:3789: checking for initscr" >&5 +echo "configure:3791: 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 3794 "configure" +#line 3796 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr(); below. */ @@ -3813,7 +3815,7 @@ initscr(); ; return 0; } EOF -if { (eval echo configure:3817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_initscr=yes" else @@ -3834,7 +3836,7 @@ else case $host_os in #(vi freebsd*) #(vi echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:3838: checking for tgoto in -lmytinfo" >&5 +echo "configure:3840: 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 @@ -3842,7 +3844,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <<EOF -#line 3846 "configure" +#line 3848 "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 @@ -3853,7 +3855,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:3857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3876,7 +3878,7 @@ fi ;; hpux10.*) echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6 -echo "configure:3880: checking for initscr in -lcur_colr" >&5 +echo "configure:3882: 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 @@ -3884,7 +3886,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcur_colr $LIBS" cat > conftest.$ac_ext <<EOF -#line 3888 "configure" +#line 3890 "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 @@ -3895,7 +3897,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:3899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3919,7 +3921,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6 -echo "configure:3923: checking for initscr in -lHcurses" >&5 +echo "configure:3925: 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 @@ -3927,7 +3929,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lHcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 3931 "configure" +#line 3933 "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 @@ -3938,7 +3940,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:3942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3984,12 +3986,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:3988: checking for tgoto" >&5 +echo "configure:3990: 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 3993 "configure" +#line 3995 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char tgoto(); below. */ @@ -4012,7 +4014,7 @@ tgoto(); ; return 0; } EOF -if { (eval echo configure:4016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_tgoto=yes" else @@ -4033,7 +4035,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:4037: checking for tgoto in -l$cf_term_lib" >&5 +echo "configure:4039: 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 @@ -4041,7 +4043,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_term_lib $LIBS" cat > conftest.$ac_ext <<EOF -#line 4045 "configure" +#line 4047 "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 @@ -4052,7 +4054,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:4056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4082,7 +4084,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:4086: checking for initscr in -l$cf_curs_lib" >&5 +echo "configure:4088: 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 @@ -4090,7 +4092,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_curs_lib $LIBS" cat > conftest.$ac_ext <<EOF -#line 4094 "configure" +#line 4096 "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 @@ -4101,7 +4103,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:4105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4127,16 +4129,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:4131: checking if we can link with $cf_curs_lib library" >&5 +echo "configure:4133: checking if we can link with $cf_curs_lib library" >&5 cat > conftest.$ac_ext <<EOF -#line 4133 "configure" +#line 4135 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:4140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_result=yes else @@ -4150,16 +4152,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:4154: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 +echo "configure:4156: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 cat > conftest.$ac_ext <<EOF -#line 4156 "configure" +#line 4158 "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:4163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_result=no else @@ -4169,14 +4171,14 @@ else LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 4173 "configure" +#line 4175 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:4180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_result=yes else @@ -4198,14 +4200,14 @@ fi echo $ac_n "checking for curses performance tradeoff""... $ac_c" 1>&6 -echo "configure:4202: checking for curses performance tradeoff" >&5 +echo "configure:4204: 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 4209 "configure" +#line 4211 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -4219,11 +4221,11 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4223: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 4227 "configure" +#line 4229 "configure" #include "confdefs.h" #define CURS_PERFORMANCE @@ -4238,7 +4240,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4244: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_curs_performance=yes else @@ -4263,13 +4265,13 @@ EOF ncurses) echo $ac_n "checking for ncurses header file""... $ac_c" 1>&6 -echo "configure:4267: checking for ncurses header file" >&5 +echo "configure:4269: 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 4273 "configure" +#line 4275 "configure" #include "confdefs.h" #include <curses.h> int main() { @@ -4286,7 +4288,7 @@ make an error ; return 0; } EOF -if { (eval echo configure:4290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_header=predefined else @@ -4372,7 +4374,7 @@ done ;; esac echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:4376: checking for ncurses version" >&5 +echo "configure:4378: 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 @@ -4397,7 +4399,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:4401: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:4403: \"$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" @@ -4406,7 +4408,7 @@ EOF else cat > conftest.$ac_ext <<EOF -#line 4410 "configure" +#line 4412 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -4429,7 +4431,7 @@ int main() exit(0); } EOF -if { (eval echo configure:4433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -4454,7 +4456,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:4458: checking for Gpm_Open in -lgpm" >&5 +echo "configure:4460: 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 @@ -4462,7 +4464,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <<EOF -#line 4466 "configure" +#line 4468 "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 @@ -4473,7 +4475,7 @@ int main() { Gpm_Open() ; return 0; } EOF -if { (eval echo configure:4477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4489,7 +4491,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:4493: checking for initscr in -lgpm" >&5 +echo "configure:4495: 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 @@ -4497,7 +4499,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <<EOF -#line 4501 "configure" +#line 4503 "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 @@ -4508,7 +4510,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:4512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4539,7 +4541,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:4543: checking for tgoto in -lmytinfo" >&5 +echo "configure:4545: 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 @@ -4547,7 +4549,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <<EOF -#line 4551 "configure" +#line 4553 "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 @@ -4558,7 +4560,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:4562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4586,12 +4588,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:4590: checking for initscr" >&5 +echo "configure:4592: 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 4595 "configure" +#line 4597 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr(); below. */ @@ -4614,7 +4616,7 @@ initscr(); ; return 0; } EOF -if { (eval echo configure:4618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_initscr=yes" else @@ -4634,17 +4636,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 -echo "configure:4638: checking for initscr in -lncurses" >&5 +echo "configure:4640: checking for initscr in -lncurses" >&5 LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 4641 "configure" +#line 4643 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:4648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cf_cv_have_lib_ncurses=yes @@ -4671,17 +4673,17 @@ test "$prefix" != /usr && cf_search="$cf_search /usr/lib /usr/lib/ncur for cf_libdir in $cf_search do echo $ac_n "checking for -lncurses in $cf_libdir""... $ac_c" 1>&6 -echo "configure:4675: checking for -lncurses in $cf_libdir" >&5 +echo "configure:4677: checking for -lncurses in $cf_libdir" >&5 LIBS="-L$cf_libdir -lncurses $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 4678 "configure" +#line 4680 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:4685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cf_cv_have_lib_ncurses=yes @@ -4713,7 +4715,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:4717: checking if we can link ncurses without $cf_ncurses_LIBS" >&5 +echo "configure:4719: 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'$//'` @@ -4722,14 +4724,14 @@ echo "configure:4717: checking if we can link ncurses without $cf_ncurses_LIBS" fi done cat > conftest.$ac_ext <<EOF -#line 4726 "configure" +#line 4728 "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:4733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -4746,20 +4748,20 @@ fi slang) echo $ac_n "checking for slang header file""... $ac_c" 1>&6 -echo "configure:4750: checking for slang header file" >&5 +echo "configure:4752: 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 4756 "configure" +#line 4758 "configure" #include "confdefs.h" #include <slang.h> int main() { printf("%s\n", SLANG_VERSION) ; return 0; } EOF -if { (eval echo configure:4763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_slang_header=predefined else @@ -4843,7 +4845,7 @@ cf_cv_lib_termcap=none # HP-UX 9.x terminfo has setupterm, but no tigetstr. if test "$termlib" = none; then echo $ac_n "checking for tigetstr in -ltermlib""... $ac_c" 1>&6 -echo "configure:4847: checking for tigetstr in -ltermlib" >&5 +echo "configure:4849: checking for tigetstr in -ltermlib" >&5 ac_lib_var=`echo termlib'_'tigetstr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4851,7 +4853,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermlib $LIBS" cat > conftest.$ac_ext <<EOF -#line 4855 "configure" +#line 4857 "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 @@ -4862,7 +4864,7 @@ int main() { tigetstr() ; return 0; } EOF -if { (eval echo configure:4866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4885,7 +4887,7 @@ fi fi if test "$cf_cv_lib_termcap" = none; then echo $ac_n "checking for tgoto in -ltermlib""... $ac_c" 1>&6 -echo "configure:4889: checking for tgoto in -ltermlib" >&5 +echo "configure:4891: checking for tgoto in -ltermlib" >&5 ac_lib_var=`echo termlib'_'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 @@ -4893,7 +4895,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermlib $LIBS" cat > conftest.$ac_ext <<EOF -#line 4897 "configure" +#line 4899 "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 @@ -4904,7 +4906,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:4908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4928,7 +4930,7 @@ fi if test "$cf_cv_lib_termcap" = none; then # allow curses library for broken AIX system. echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6 -echo "configure:4932: checking for initscr in -lcurses" >&5 +echo "configure:4934: 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 @@ -4936,7 +4938,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 4940 "configure" +#line 4942 "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 @@ -4947,7 +4949,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:4951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4968,7 +4970,7 @@ else fi echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:4972: checking for tgoto in -ltermcap" >&5 +echo "configure:4974: 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 @@ -4976,7 +4978,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <<EOF -#line 4980 "configure" +#line 4982 "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 @@ -4987,7 +4989,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:4991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5010,7 +5012,7 @@ fi fi if test "$cf_cv_lib_termcap" = none; then echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:5014: checking for tgoto in -ltermcap" >&5 +echo "configure:5016: 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 @@ -5018,7 +5020,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <<EOF -#line 5022 "configure" +#line 5024 "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 @@ -5029,7 +5031,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:5033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5052,7 +5054,7 @@ fi fi if test "$cf_cv_lib_termcap" = none; then echo $ac_n "checking for tgoto in -lncurses""... $ac_c" 1>&6 -echo "configure:5056: checking for tgoto in -lncurses" >&5 +echo "configure:5058: checking for tgoto in -lncurses" >&5 ac_lib_var=`echo ncurses'_'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 @@ -5060,7 +5062,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 5064 "configure" +#line 5066 "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 @@ -5071,7 +5073,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:5075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5101,12 +5103,12 @@ fi cf_slang_LIBS2="$LIBS" echo $ac_n "checking for acos""... $ac_c" 1>&6 -echo "configure:5105: checking for acos" >&5 +echo "configure:5107: 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 5110 "configure" +#line 5112 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char acos(); below. */ @@ -5129,7 +5131,7 @@ acos(); ; return 0; } EOF -if { (eval echo configure:5133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_acos=yes" else @@ -5148,7 +5150,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for acos in -lm""... $ac_c" 1>&6 -echo "configure:5152: checking for acos in -lm" >&5 +echo "configure:5154: 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 @@ -5156,7 +5158,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 5160 "configure" +#line 5162 "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 @@ -5167,7 +5169,7 @@ int main() { acos() ; return 0; } EOF -if { (eval echo configure:5171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5207,12 +5209,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:5211: checking for SLtt_get_screen_size" >&5 +echo "configure:5213: 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 5216 "configure" +#line 5218 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char SLtt_get_screen_size(); below. */ @@ -5235,7 +5237,7 @@ SLtt_get_screen_size(); ; return 0; } EOF -if { (eval echo configure:5239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_SLtt_get_screen_size=yes" else @@ -5255,17 +5257,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for SLtt_get_screen_size in -lslang""... $ac_c" 1>&6 -echo "configure:5259: checking for SLtt_get_screen_size in -lslang" >&5 +echo "configure:5261: checking for SLtt_get_screen_size in -lslang" >&5 LIBS="-lslang $LIBS" cat > conftest.$ac_ext <<EOF -#line 5262 "configure" +#line 5264 "configure" #include "confdefs.h" #include <slang.h> int main() { SLtt_get_screen_size() ; return 0; } EOF -if { (eval echo configure:5269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cf_cv_have_lib_slang=yes @@ -5292,17 +5294,17 @@ test "$prefix" != /usr && cf_search="$cf_search /usr/lib /usr/lib/slan for cf_libdir in $cf_search do echo $ac_n "checking for -lslang in $cf_libdir""... $ac_c" 1>&6 -echo "configure:5296: checking for -lslang in $cf_libdir" >&5 +echo "configure:5298: checking for -lslang in $cf_libdir" >&5 LIBS="-L$cf_libdir -lslang $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 5299 "configure" +#line 5301 "configure" #include "confdefs.h" #include <slang.h> int main() { SLtt_get_screen_size() ; return 0; } EOF -if { (eval echo configure:5306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cf_cv_have_lib_slang=yes @@ -5333,7 +5335,7 @@ esac cf_slang_LIBS3="$LIBS" echo $ac_n "checking if we can link slang without termcap""... $ac_c" 1>&6 -echo "configure:5337: checking if we can link slang without termcap" >&5 +echo "configure:5339: 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 @@ -5341,14 +5343,14 @@ else fi LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s@$cf_exclude@@" -e 's@^.@@'` cat > conftest.$ac_ext <<EOF -#line 5345 "configure" +#line 5347 "configure" #include "confdefs.h" #include <slang.h> int main() { SLtt_get_screen_size() ; return 0; } EOF -if { (eval echo configure:5352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_result=yes else @@ -5368,7 +5370,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:5372: checking for location of config-file" >&5 +echo "configure:5374: 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" @@ -5378,12 +5380,12 @@ echo "$ac_t""$LYNX_CFG_FILE" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:5382: checking for ANSI C header files" >&5 +echo "configure:5384: 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 5387 "configure" +#line 5389 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -5391,7 +5393,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5397: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5408,7 +5410,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 5412 "configure" +#line 5414 "configure" #include "confdefs.h" #include <string.h> EOF @@ -5426,7 +5428,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 5430 "configure" +#line 5432 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -5447,7 +5449,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 5451 "configure" +#line 5453 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -5458,7 +5460,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:5462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -5482,12 +5484,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:5486: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:5488: 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 5491 "configure" +#line 5493 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -5496,7 +5498,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:5500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -5521,12 +5523,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:5525: checking for $ac_hdr that defines DIR" >&5 +echo "configure:5527: 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 5530 "configure" +#line 5532 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -5534,7 +5536,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:5538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -5559,7 +5561,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:5563: checking for opendir in -ldir" >&5 +echo "configure:5565: 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 @@ -5567,7 +5569,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <<EOF -#line 5571 "configure" +#line 5573 "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 @@ -5578,7 +5580,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:5582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5600,7 +5602,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:5604: checking for opendir in -lx" >&5 +echo "configure:5606: 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 @@ -5608,7 +5610,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <<EOF -#line 5612 "configure" +#line 5614 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5619,7 +5621,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:5623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5658,17 +5660,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:5662: checking for $ac_hdr" >&5 +echo "configure:5664: 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 5667 "configure" +#line 5669 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5672: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5674: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5696,13 +5698,13 @@ done echo $ac_n "checking termio.h and termios.h""... $ac_c" 1>&6 -echo "configure:5700: checking termio.h and termios.h" >&5 +echo "configure:5702: 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 5706 "configure" +#line 5708 "configure" #include "confdefs.h" #if HAVE_TERMIO_H @@ -5715,7 +5717,7 @@ int main() { putchar (0x0a) ; return 0; } EOF -if { (eval echo configure:5719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5721: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_termio_and_termios=yes else @@ -5738,17 +5740,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:5742: checking for $ac_hdr" >&5 +echo "configure:5744: 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 5747 "configure" +#line 5749 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5785,17 +5787,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:5789: checking for $ac_hdr" >&5 +echo "configure:5791: 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 5794 "configure" +#line 5796 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5801: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5825,17 +5827,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:5829: checking for $ac_hdr" >&5 +echo "configure:5831: 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 5834 "configure" +#line 5836 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5841: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5876,13 +5878,13 @@ fi echo $ac_n "checking for union wait""... $ac_c" 1>&6 -echo "configure:5880: checking for union wait" >&5 +echo "configure:5882: 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 5886 "configure" +#line 5888 "configure" #include "confdefs.h" $cf_wait_headers int main() { @@ -5893,7 +5895,7 @@ int x; ; return 0; } EOF -if { (eval echo configure:5897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_cv_type_unionwait=no echo compiles ok w/o union wait 1>&5 @@ -5904,7 +5906,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 5908 "configure" +#line 5910 "configure" #include "confdefs.h" $cf_wait_headers int main() { @@ -5919,7 +5921,7 @@ union wait x; ; return 0; } EOF -if { (eval echo configure:5923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_cv_type_unionwait=yes echo compiles ok with union wait and possibly macros too 1>&5 @@ -5946,20 +5948,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:5950: checking if union wait can be used as wait-arg" >&5 +echo "configure:5952: 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 5956 "configure" +#line 5958 "configure" #include "confdefs.h" $cf_wait_headers int main() { union wait x; wait(&x) ; return 0; } EOF -if { (eval echo configure:5963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_arg_union_wait=yes else @@ -5979,20 +5981,20 @@ EOF echo $ac_n "checking if union wait can be used as waitpid-arg""... $ac_c" 1>&6 -echo "configure:5983: checking if union wait can be used as waitpid-arg" >&5 +echo "configure:5985: 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 5989 "configure" +#line 5991 "configure" #include "confdefs.h" $cf_wait_headers int main() { union wait x; waitpid(0, &x, 0) ; return 0; } EOF -if { (eval echo configure:5996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_arg_union_waitpid=yes else @@ -6014,12 +6016,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:6018: checking for uid_t in sys/types.h" >&5 +echo "configure:6020: 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 6023 "configure" +#line 6025 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -6048,7 +6050,7 @@ EOF fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 -echo "configure:6052: checking type of array argument to getgroups" >&5 +echo "configure:6054: 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 @@ -6056,7 +6058,7 @@ else ac_cv_type_getgroups=cross else cat > conftest.$ac_ext <<EOF -#line 6060 "configure" +#line 6062 "configure" #include "confdefs.h" /* Thanks to Mike Rendell for this test. */ @@ -6081,7 +6083,7 @@ main() } EOF -if { (eval echo configure:6085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_type_getgroups=gid_t else @@ -6095,7 +6097,7 @@ fi if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext <<EOF -#line 6099 "configure" +#line 6101 "configure" #include "confdefs.h" #include <unistd.h> EOF @@ -6119,12 +6121,12 @@ EOF echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:6123: checking for pid_t" >&5 +echo "configure:6125: 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 6128 "configure" +#line 6130 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -6152,12 +6154,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:6156: checking for uid_t in sys/types.h" >&5 +echo "configure:6158: 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 6161 "configure" +#line 6163 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -6186,12 +6188,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:6190: checking for mode_t" >&5 +echo "configure:6192: 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 6195 "configure" +#line 6197 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -6222,17 +6224,17 @@ fi ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:6226: checking for vfork.h" >&5 +echo "configure:6228: 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 6231 "configure" +#line 6233 "configure" #include "confdefs.h" #include <vfork.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6236: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6257,18 +6259,18 @@ else fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:6261: checking for working vfork" >&5 +echo "configure:6263: 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:6267: checking for vfork" >&5 +echo "configure:6269: 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 6272 "configure" +#line 6274 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vfork(); below. */ @@ -6291,7 +6293,7 @@ vfork(); ; return 0; } EOF -if { (eval echo configure:6295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vfork=yes" else @@ -6312,7 +6314,7 @@ fi else cat > conftest.$ac_ext <<EOF -#line 6316 "configure" +#line 6318 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include <stdio.h> @@ -6407,7 +6409,7 @@ main() { } } EOF -if { (eval echo configure:6411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_vfork_works=yes else @@ -6431,13 +6433,13 @@ fi echo $ac_n "checking if we should use fcntl or ioctl""... $ac_c" 1>&6 -echo "configure:6435: checking if we should use fcntl or ioctl" >&5 +echo "configure:6437: 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 6441 "configure" +#line 6443 "configure" #include "confdefs.h" #include <sys/types.h> @@ -6449,7 +6451,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_cv_fionbio=ioctl else @@ -6458,7 +6460,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 6462 "configure" +#line 6464 "configure" #include "confdefs.h" #include <sys/types.h> @@ -6475,7 +6477,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_cv_fionbio=fcntl else @@ -6498,20 +6500,20 @@ EOF echo $ac_n "checking for broken/missing definition of remove""... $ac_c" 1>&6 -echo "configure:6502: checking for broken/missing definition of remove" >&5 +echo "configure:6504: 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 6508 "configure" +#line 6510 "configure" #include "confdefs.h" #include <stdio.h> int main() { remove("dummy") ; return 0; } EOF -if { (eval echo configure:6515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_cv_baddef_remove=no else @@ -6519,7 +6521,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 6523 "configure" +#line 6525 "configure" #include "confdefs.h" #include <stdio.h> int __unlink(name) { return unlink(name); } @@ -6527,7 +6529,7 @@ int main() { remove("dummy") ; return 0; } EOF -if { (eval echo configure:6531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_cv_baddef_remove=yes else @@ -6551,13 +6553,13 @@ EOF echo $ac_n "checking for lstat""... $ac_c" 1>&6 -echo "configure:6555: checking for lstat" >&5 +echo "configure:6557: 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 6561 "configure" +#line 6563 "configure" #include "confdefs.h" #include <sys/types.h> @@ -6566,7 +6568,7 @@ int main() { lstat(".", (struct stat *)0) ; return 0; } EOF -if { (eval echo configure:6570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_func_lstat=yes else @@ -6598,12 +6600,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6602: checking for $ac_func" >&5 +echo "configure:6604: 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 6607 "configure" +#line 6609 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6626,7 +6628,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6656,12 +6658,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6660: checking for $ac_func" >&5 +echo "configure:6662: 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 6665 "configure" +#line 6667 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6684,7 +6686,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6715,12 +6717,12 @@ for ac_func in strstr do echo $ac_n "checking for $ac_func declaration""... $ac_c" 1>&6 -echo "configure:6719: checking for $ac_func declaration" >&5 +echo "configure:6721: 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 6724 "configure" +#line 6726 "configure" #include "confdefs.h" #include <string.h> int main() { @@ -6729,11 +6731,11 @@ extern int ${ac_func}(); #endif ; return 0; } EOF -if { (eval echo configure:6733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6735: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 6737 "configure" +#line 6739 "configure" #include "confdefs.h" #include <string.h> int main() { @@ -6742,7 +6744,7 @@ int (*p)() = ${ac_func}; #endif ; return 0; } EOF -if { (eval echo configure:6746: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6748: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_decl_$ac_func=yes" @@ -6784,12 +6786,12 @@ for ac_func in getgrgid getgrnam do echo $ac_n "checking for $ac_func declaration""... $ac_c" 1>&6 -echo "configure:6788: checking for $ac_func declaration" >&5 +echo "configure:6790: 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 6793 "configure" +#line 6795 "configure" #include "confdefs.h" #include <stdio.h> @@ -6800,11 +6802,11 @@ extern int ${ac_func}(); #endif ; return 0; } EOF -if { (eval echo configure:6804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 6808 "configure" +#line 6810 "configure" #include "confdefs.h" #include <stdio.h> @@ -6815,7 +6817,7 @@ int (*p)() = ${ac_func}; #endif ; return 0; } EOF -if { (eval echo configure:6819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_decl_$ac_func=yes" @@ -6857,13 +6859,13 @@ done echo $ac_n "checking if TRUE/FALSE are defined""... $ac_c" 1>&6 -echo "configure:6861: checking if TRUE/FALSE are defined" >&5 +echo "configure:6863: 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 6867 "configure" +#line 6869 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -6872,7 +6874,7 @@ int main() { int x = TRUE, y = FALSE ; return 0; } EOF -if { (eval echo configure:6876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_bool_defs=yes else @@ -6899,13 +6901,13 @@ fi echo $ac_n "checking declaration of errno""... $ac_c" 1>&6 -echo "configure:6903: checking declaration of errno" >&5 +echo "configure:6905: checking declaration of errno" >&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 6909 "configure" +#line 6911 "configure" #include "confdefs.h" #if HAVE_STDLIB_H @@ -6918,7 +6920,7 @@ int main() { long x = (long) errno ; return 0; } EOF -if { (eval echo configure:6922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_dcl_'errno'=yes' else @@ -6948,9 +6950,9 @@ cf_result=`echo $cf_result | tr '[a-z]' '[A-Z]'` EOF echo $ac_n "checking existence of errno""... $ac_c" 1>&6 -echo "configure:6952: checking existence of errno" >&5 +echo "configure:6954: checking existence of errno" >&5 cat > conftest.$ac_ext <<EOF -#line 6954 "configure" +#line 6956 "configure" #include "confdefs.h" #undef errno @@ -6960,7 +6962,7 @@ int main() { errno = 2 ; return 0; } EOF -if { (eval echo configure:6964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval 'cf_cv_have_'errno'=yes' else @@ -6990,20 +6992,20 @@ EOF echo $ac_n "checking for setlocale()""... $ac_c" 1>&6 -echo "configure:6994: checking for setlocale()" >&5 +echo "configure:6996: 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 7000 "configure" +#line 7002 "configure" #include "confdefs.h" #include <locale.h> int main() { setlocale(LC_ALL, "") ; return 0; } EOF -if { (eval echo configure:7007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_cv_locale=yes else @@ -7024,13 +7026,13 @@ EOF echo $ac_n "checking if NGROUPS is defined""... $ac_c" 1>&6 -echo "configure:7028: checking if NGROUPS is defined" >&5 +echo "configure:7030: 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 7034 "configure" +#line 7036 "configure" #include "confdefs.h" #if HAVE_SYS_PARAM_H @@ -7044,7 +7046,7 @@ int main() { int x = NGROUPS ; return 0; } EOF -if { (eval echo configure:7048: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ngroups=yes else @@ -7052,7 +7054,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 7056 "configure" +#line 7058 "configure" #include "confdefs.h" #if HAVE_SYS_PARAM_H @@ -7066,7 +7068,7 @@ int main() { int x = NGROUPS_MAX ; return 0; } EOF -if { (eval echo configure:7070: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ngroups=NGROUPS_MAX else @@ -7100,13 +7102,13 @@ for cf_name in sys_nerr sys_errlist do echo $ac_n "checking declaration of $cf_name""... $ac_c" 1>&6 -echo "configure:7104: checking declaration of $cf_name" >&5 +echo "configure:7106: checking declaration of $cf_name" >&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 7110 "configure" +#line 7112 "configure" #include "confdefs.h" #if HAVE_STDLIB_H @@ -7119,7 +7121,7 @@ int main() { long x = (long) $cf_name ; return 0; } EOF -if { (eval echo configure:7123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_dcl_'$cf_name'=yes' else @@ -7149,9 +7151,9 @@ cf_result=`echo $cf_result | tr '[a-z]' '[A-Z]'` EOF echo $ac_n "checking existence of $cf_name""... $ac_c" 1>&6 -echo "configure:7153: checking existence of $cf_name" >&5 +echo "configure:7155: checking existence of $cf_name" >&5 cat > conftest.$ac_ext <<EOF -#line 7155 "configure" +#line 7157 "configure" #include "confdefs.h" #undef $cf_name @@ -7161,7 +7163,7 @@ int main() { $cf_name = 2 ; return 0; } EOF -if { (eval echo configure:7165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval 'cf_cv_have_'$cf_name'=yes' else @@ -7192,13 +7194,13 @@ done echo $ac_n "checking if struct utmp is declared""... $ac_c" 1>&6 -echo "configure:7196: checking if struct utmp is declared" >&5 +echo "configure:7198: 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 7202 "configure" +#line 7204 "configure" #include "confdefs.h" #include <sys/types.h> @@ -7207,7 +7209,7 @@ int main() { struct utmp x; char *y = &x.ut_host[0] ; return 0; } EOF -if { (eval echo configure:7211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7213: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_have_utmp=yes else @@ -7215,14 +7217,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 7219 "configure" +#line 7221 "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:7226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7228: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_have_utmp=utmpx else @@ -7253,7 +7255,7 @@ EOF if test $cf_cv_screen != slang ; then echo $ac_n "checking if curses supports alternate-character set""... $ac_c" 1>&6 -echo "configure:7257: checking if curses supports alternate-character set" >&5 +echo "configure:7259: 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 @@ -7261,7 +7263,7 @@ else for mapname in acs_map _acs_map do cat > conftest.$ac_ext <<EOF -#line 7265 "configure" +#line 7267 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -7270,7 +7272,7 @@ int main() { chtype x = $mapname['l']; $mapname['m'] = 0 ; return 0; } EOF -if { (eval echo configure:7274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_cv_alt_char_set=$mapname break @@ -7293,13 +7295,13 @@ EOF echo $ac_n "checking if curses supports fancy attributes""... $ac_c" 1>&6 -echo "configure:7297: checking if curses supports fancy attributes" >&5 +echo "configure:7299: 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 7303 "configure" +#line 7305 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -7312,7 +7314,7 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE); ; return 0; } EOF -if { (eval echo configure:7316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_cv_fancy_curses=yes else @@ -7332,7 +7334,7 @@ EOF echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:7336: checking for ncurses version" >&5 +echo "configure:7338: 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 @@ -7357,7 +7359,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:7361: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:7363: \"$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" @@ -7366,7 +7368,7 @@ EOF else cat > conftest.$ac_ext <<EOF -#line 7370 "configure" +#line 7372 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -7389,7 +7391,7 @@ int main() exit(0); } EOF -if { (eval echo configure:7393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -7409,13 +7411,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:7413: checking for obsolete/broken version of ncurses" >&5 +echo "configure:7415: 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 7419 "configure" +#line 7421 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -7429,7 +7431,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7435: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_broken=no else @@ -7454,13 +7456,13 @@ fi echo $ac_n "checking if curses supports color attributes""... $ac_c" 1>&6 -echo "configure:7458: checking if curses supports color attributes" >&5 +echo "configure:7460: 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 7464 "configure" +#line 7466 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -7475,7 +7477,7 @@ chtype x = COLOR_BLUE; ; return 0; } EOF -if { (eval echo configure:7479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_cv_color_curses=yes else @@ -7502,7 +7504,7 @@ fi echo $ac_n "checking declaration of size-change""... $ac_c" 1>&6 -echo "configure:7506: checking declaration of size-change" >&5 +echo "configure:7508: 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 @@ -7516,7 +7518,7 @@ do CFLAGS="$cf_save_CFLAGS" test -n "$cf_opts" && CFLAGS="$CFLAGS -D$cf_opts" cat > conftest.$ac_ext <<EOF -#line 7520 "configure" +#line 7522 "configure" #include "confdefs.h" #include <sys/types.h> #if HAVE_TERMIOS_H @@ -7555,7 +7557,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7559: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sizechange=yes else @@ -7587,20 +7589,20 @@ EOF echo $ac_n "checking if ttytype is declared in curses library""... $ac_c" 1>&6 -echo "configure:7591: checking if ttytype is declared in curses library" >&5 +echo "configure:7593: 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 7597 "configure" +#line 7599 "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:7604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_cv_have_ttytype=yes else @@ -7628,12 +7630,12 @@ EOF do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7632: checking for $ac_func" >&5 +echo "configure:7634: 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 7637 "configure" +#line 7639 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7656,7 +7658,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:7660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7685,32 +7687,80 @@ fi -echo $ac_n "checking if experimental forms-based options screen should be used""... $ac_c" 1>&6 -echo "configure:7690: checking if experimental forms-based options screen should be used" >&5 +echo $ac_n "checking if new-style forms-based options screen should be used""... $ac_c" 1>&6 +echo "configure:7692: 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 enableval="$enable_forms_options" - test "$enableval" != yes && enableval=no - if test "$enableval" != "no" ; then + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then use_forms_options=$enableval else - use_forms_options=no + use_forms_options=yes fi else - enableval=no - use_forms_options=no + enableval=yes + use_forms_options=yes fi echo "$ac_t""$use_forms_options" 1>&6 -test $use_forms_options != no && cat >> confdefs.h <<\EOF -#define EXP_FORMS_OPTIONS 1 +test $use_forms_options = no && cat >> confdefs.h <<\EOF +#define NO_OPTION_FORMS 1 +EOF + + +echo $ac_n "checking if old-style options menu should be used""... $ac_c" 1>&6 +echo "configure:7716: 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 + enableval="$enable_menu_options" + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + use_menu_options=$enableval + else + use_menu_options=yes + fi +else + enableval=yes + use_menu_options=yes + +fi + +echo "$ac_t""$use_menu_options" 1>&6 +test $use_menu_options = no && cat >> confdefs.h <<\EOF +#define NO_OPTION_MENU 1 +EOF + + +echo $ac_n "checking if configuration info should be browsable""... $ac_c" 1>&6 +echo "configure:7740: 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 + enableval="$enable_config_info" + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + use_config_info=$enableval + else + use_config_info=yes + fi +else + enableval=yes + use_config_info=yes + +fi + +echo "$ac_t""$use_config_info" 1>&6 +test $use_config_info = no && cat >> confdefs.h <<\EOF +#define NO_CONFIG_INFO 1 EOF echo $ac_n "checking if experimental persistent-cookie logic should be used""... $ac_c" 1>&6 -echo "configure:7714: checking if experimental persistent-cookie logic should be used" >&5 +echo "configure:7764: checking if experimental 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 @@ -7734,7 +7784,7 @@ EOF echo $ac_n "checking if color-style code should be used""... $ac_c" 1>&6 -echo "configure:7738: checking if color-style code should be used" >&5 +echo "configure:7788: 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 @@ -7782,7 +7832,7 @@ EOF echo "$ac_t""yes" 1>&6 echo $ac_n "checking for location of style-sheet file""... $ac_c" 1>&6 -echo "configure:7786: checking for location of style-sheet file" >&5 +echo "configure:7836: 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" @@ -7795,7 +7845,7 @@ esac echo $ac_n "checking if partial-display should be used""... $ac_c" 1>&6 -echo "configure:7799: checking if partial-display should be used" >&5 +echo "configure:7849: checking if partial-display should be used" >&5 # Check whether --enable-partial or --disable-partial was given. if test "${enable_partial+set}" = set; then @@ -7824,7 +7874,7 @@ test ".$ac_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:7828: checking if you want to use default-colors" >&5 +echo "configure:7878: 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 @@ -7849,7 +7899,7 @@ EOF fi echo $ac_n "checking if you want to use extended HTML DTD logic""... $ac_c" 1>&6 -echo "configure:7853: checking if you want to use extended HTML DTD logic" >&5 +echo "configure:7903: 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 @@ -7873,7 +7923,7 @@ EOF echo $ac_n "checking if you want to use external commands""... $ac_c" 1>&6 -echo "configure:7877: checking if you want to use external commands" >&5 +echo "configure:7927: 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 @@ -7897,7 +7947,7 @@ EOF echo $ac_n "checking if you want to use setfont support""... $ac_c" 1>&6 -echo "configure:7901: checking if you want to use setfont support" >&5 +echo "configure:7951: 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 @@ -7921,7 +7971,7 @@ EOF echo $ac_n "checking if you want cgi-link support""... $ac_c" 1>&6 -echo "configure:7925: checking if you want cgi-link support" >&5 +echo "configure:7975: 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 @@ -7940,7 +7990,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you want exec-links support""... $ac_c" 1>&6 -echo "configure:7944: checking if you want exec-links support" >&5 +echo "configure:7994: 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 @@ -7959,7 +8009,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you want exec-scripts support""... $ac_c" 1>&6 -echo "configure:7963: checking if you want exec-scripts support" >&5 +echo "configure:8013: 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 @@ -7978,7 +8028,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you want internal-links feature""... $ac_c" 1>&6 -echo "configure:7982: checking if you want internal-links feature" >&5 +echo "configure:8032: 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 @@ -8002,7 +8052,7 @@ EOF echo $ac_n "checking if you want to fork NSL requests""... $ac_c" 1>&6 -echo "configure:8006: checking if you want to fork NSL requests" >&5 +echo "configure:8056: 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 @@ -8026,7 +8076,7 @@ EOF echo $ac_n "checking if you want to log URL requests via syslog""... $ac_c" 1>&6 -echo "configure:8030: checking if you want to log URL requests via syslog" >&5 +echo "configure:8080: 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 @@ -8050,7 +8100,7 @@ EOF echo $ac_n "checking if you want to underline links""... $ac_c" 1>&6 -echo "configure:8054: checking if you want to underline links" >&5 +echo "configure:8104: checking if you want to underline links" >&5 # Check whether --enable-underlines or --disable-underlines was given. if test "${enable_underlines+set}" = set; then @@ -8074,7 +8124,7 @@ EOF echo $ac_n "checking if help files should be gzip'ed""... $ac_c" 1>&6 -echo "configure:8078: checking if help files should be gzip'ed" >&5 +echo "configure:8128: 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 @@ -8103,7 +8153,7 @@ fi echo $ac_n "checking if you want to use zlib for decompression of some gzip files""... $ac_c" 1>&6 -echo "configure:8107: checking if you want to use zlib for decompression of some gzip files" >&5 +echo "configure:8157: 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 @@ -8120,12 +8170,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:8124: checking for gzopen" >&5 +echo "configure:8174: 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 8129 "configure" +#line 8179 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gzopen(); below. */ @@ -8148,7 +8198,7 @@ gzopen(); ; return 0; } EOF -if { (eval echo configure:8152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gzopen=yes" else @@ -8168,17 +8218,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for gzopen in -lz""... $ac_c" 1>&6 -echo "configure:8172: checking for gzopen in -lz" >&5 +echo "configure:8222: checking for gzopen in -lz" >&5 LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 8175 "configure" +#line 8225 "configure" #include "confdefs.h" #include <zlib.h> int main() { gzopen("name","mode") ; return 0; } EOF -if { (eval echo configure:8182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cf_cv_have_lib_z=yes @@ -8205,17 +8255,17 @@ test "$prefix" != /usr && cf_search="$cf_search /usr/lib /usr/lib/z" for cf_libdir in $cf_search do echo $ac_n "checking for -lz in $cf_libdir""... $ac_c" 1>&6 -echo "configure:8209: checking for -lz in $cf_libdir" >&5 +echo "configure:8259: checking for -lz in $cf_libdir" >&5 LIBS="-L$cf_libdir -lz $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 8212 "configure" +#line 8262 "configure" #include "confdefs.h" #include <zlib.h> int main() { gzopen("name","mode") ; return 0; } EOF -if { (eval echo configure:8219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cf_cv_have_lib_z=yes @@ -8256,7 +8306,7 @@ fi # 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:8260: checking if directory-editor code should be used" >&5 +echo "configure:8310: 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 @@ -8282,7 +8332,7 @@ EOF echo $ac_n "checking if you wish to allow extracting from archives via DirEd""... $ac_c" 1>&6 -echo "configure:8286: checking if you wish to allow extracting from archives via DirEd" >&5 +echo "configure:8336: checking if you wish to allow extracting from archives via DirEd" >&5 # Check whether --enable-dired-archive or --disable-dired-archive was given. if test "${enable_dired_archive+set}" = set; then @@ -8301,7 +8351,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you wish to allow users to redefine DirEd keys""... $ac_c" 1>&6 -echo "configure:8305: checking if you wish to allow users to redefine DirEd keys" >&5 +echo "configure:8355: checking if you wish to allow users to redefine DirEd keys" >&5 # Check whether --enable-dired-override or --disable-dired-override was given. if test "${enable_dired_override+set}" = set; then @@ -8327,7 +8377,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:8331: checking if you wish to allow permissions commands via DirEd" >&5 +echo "configure:8381: 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 @@ -8353,7 +8403,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:8357: checking if you wish to allow executable-permission commands via DirEd" >&5 +echo "configure:8407: 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 @@ -8372,7 +8422,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:8376: checking if you wish to allow "tar" commands from DirEd" >&5 +echo "configure:8426: 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 @@ -8398,7 +8448,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:8402: checking if you wish to allow "uudecode" commands from DirEd" >&5 +echo "configure:8452: 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 @@ -8424,7 +8474,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:8428: checking if you wish to allow "zip" and "unzip" commands from DirEd" >&5 +echo "configure:8478: 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 @@ -8450,7 +8500,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:8454: checking if you wish to allow "gzip" and "gunzip" commands from DirEd" >&5 +echo "configure:8504: 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 @@ -8477,7 +8527,7 @@ fi fi echo $ac_n "checking if you want long-directory listings""... $ac_c" 1>&6 -echo "configure:8481: checking if you want long-directory listings" >&5 +echo "configure:8531: 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 @@ -8503,7 +8553,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if parent-directory references are permitted""... $ac_c" 1>&6 -echo "configure:8507: checking if parent-directory references are permitted" >&5 +echo "configure:8557: 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 @@ -8523,7 +8573,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:8527: checking if we can include termio.h with curses" >&5 +echo "configure:8577: 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 @@ -8532,7 +8582,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 8536 "configure" +#line 8586 "configure" #include "confdefs.h" #include <LYCurses.h> @@ -8541,7 +8591,7 @@ int main() { putchar(0x0a) ; return 0; } EOF -if { (eval echo configure:8545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8595: \"$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 c0dc030b..3418d032 100644 --- a/configure.in +++ b/configure.in @@ -442,13 +442,29 @@ dnl -------------------------------------------------------------------------- CF_HELP_MESSAGE( Miscellaneous Options:) -AC_MSG_CHECKING(if experimental forms-based options screen should be used) -CF_ARG_ENABLE(forms-options, -[ --enable-forms-options use experimental forms-based options], +AC_MSG_CHECKING(if new-style forms-based options screen should be used) +CF_ARG_DISABLE(forms-options, +[ --disable-forms-options disable experimental forms-based options], [use_forms_options=$enableval], - [use_forms_options=no]) + [use_forms_options=yes]) AC_MSG_RESULT($use_forms_options) -test $use_forms_options != no && AC_DEFINE(EXP_FORMS_OPTIONS) +test $use_forms_options = no && AC_DEFINE(NO_OPTION_FORMS) + +AC_MSG_CHECKING(if old-style options menu should be used) +CF_ARG_DISABLE(menu-options, +[ --disable-menu-options disable old-style option menu], + [use_menu_options=$enableval], + [use_menu_options=yes]) +AC_MSG_RESULT($use_menu_options) +test $use_menu_options = no && AC_DEFINE(NO_OPTION_MENU) + +AC_MSG_CHECKING(if configuration info should be browsable) +CF_ARG_DISABLE(config-info, +[ --disable-config-info disable browsable configuration-info], + [use_config_info=$enableval], + [use_config_info=yes]) +AC_MSG_RESULT($use_config_info) +test $use_config_info = no && AC_DEFINE(NO_CONFIG_INFO) AC_MSG_CHECKING(if experimental persistent-cookie logic should be used) CF_ARG_ENABLE(persistent-cookies, diff --git a/lynx.cfg b/lynx.cfg index 6e5816e8..5de81cb1 100644 --- a/lynx.cfg +++ b/lynx.cfg @@ -388,8 +388,8 @@ DEFAULT_INDEX_FILE:http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/MetaIndex.html #URL_DOMAIN_SUFFIXES:.com,.edu,.net,.org # Lynx Options Menu style toggle: forms-based or old-style. -# Works if old-style menu is compiled in. -#FORMS_OPTIONS:FALSE +# Works if old-style menu is compiled in as well as the forms-based menu. +#FORMS_OPTIONS:TRUE # Display partial pages while downloading #PARTIAL:TRUE @@ -453,12 +453,6 @@ DEFAULT_INDEX_FILE:http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/MetaIndex.html # If this option is set here, it will override the setting in userdefs.h. #VERBOSE_IMAGES:TRUE -# VERBOSE_LINKS controls whether Lynx precedes links with the string "(LINK)", -# which is done to accommodate blind users. -# -# If this option is set here, it will override the setting in userdefs.h. -#VERBOSE_LINKS:FALSE - # If BOLD_HEADERS is set to TRUE the HT_BOLD default style will be acted # upon for <H1> through <H6> headers. The compilation default is FALSE # (only the indentation styles are acted upon, but see BOLD_H1, below). diff --git a/lynx.hlp b/lynx.hlp index f877d32f..7f2ac5b1 100644 --- a/lynx.hlp +++ b/lynx.hlp @@ -143,6 +143,9 @@ -force_secure toggles forcing of the secure flag for SSL cookies. + -forms_options + toggles the style of options (menu or forms). + -from toggles transmissions of From headers. diff --git a/lynx.man b/lynx.man index 22600cb3..654df31c 100644 --- a/lynx.man +++ b/lynx.man @@ -175,6 +175,9 @@ forces the first document to be interpreted as HTML. .B -force_secure toggles forcing of the secure flag for SSL cookies. .TP +.B -forms_options +toggles the style of options (menu or forms). +.TP .B -from toggles transmissions of From headers. .TP diff --git a/lynx_help/Lynx_users_guide.html b/lynx_help/Lynx_users_guide.html index 2c96106e..bec13eef 100644 --- a/lynx_help/Lynx_users_guide.html +++ b/lynx_help/Lynx_users_guide.html @@ -1910,7 +1910,10 @@ prompts, or ne'<em>V</em>'er to never allow cookies from that MIME headers). All unexpired cookies are held in a hypothetical <em>Cookie Jar</em> which can be examined via the COOKIE_JAR keystroke command, normally mapped to <em>Ctrl-K</em>, for invoking the <a -href="keystrokes/cookie_help.html">Cookie Jar Page</a>. +href="keystrokes/cookie_help.html">Cookie Jar Page</a>. If Lynx has been +compiled with the --enable-persistent-cookies flag, then unexpired cookies +will be stored between sessions in the filename set with the COOKIE_FILE +option in your .lynxrc. <p>A common use of cookies by http servers is simply to track the documents visited by individual users. Though this can be useful to the diff --git a/makefile.in b/makefile.in index 4c33eba6..769be1dc 100644 --- a/makefile.in +++ b/makefile.in @@ -135,7 +135,6 @@ SITE_DEFS = # Your defines here # -DEXEC_LINKS # -DEXEC_SCRIPTS # -DEXP_CHARTRANS_AUTOSWITCH -# -DEXP_FORMS_OPTIONS # -DEXP_PERSISTENT_COOKIES # -DLINKEDSTYLES # -DLONG_LIST @@ -144,6 +143,8 @@ SITE_DEFS = # Your defines here # -DNCURSES # -DNO_CHANGE_EXECUTE_PERMS # -DNO_EXTENDED_HTMLDTD +# -DOPTIONS_FORMS +# -DOPTIONS_MENU # -DNO_PARENT_DIR_REFERENCE # -DNSL_FORK # -DOK_GZIP diff --git a/src/GridText.c b/src/GridText.c index c9d5b5a9..8319737c 100644 --- a/src/GridText.c +++ b/src/GridText.c @@ -2719,9 +2719,6 @@ PUBLIC int HText_beginAnchor ARGS3( /* * If we are doing link_numbering add the link number. */ - if (verbose_links) { - HText_appendText(text, "(LINK)"); - } if ((a->number > 0) && (keypad_mode == LINKS_ARE_NUMBERED || keypad_mode == LINKS_AND_FORM_FIELDS_ARE_NUMBERED)) { diff --git a/src/GridText.h b/src/GridText.h index a17ceb23..a99f66da 100644 --- a/src/GridText.h +++ b/src/GridText.h @@ -83,9 +83,6 @@ extern HTParentAnchor * HTMainAnchor; /* Anchor for HTMainText */ #endif /* SHORT_NAMES */ extern int WWW_TraceFlag; -extern int HTCacheSize; - -extern BOOLEAN mustshow; #if defined(VMS) && defined(VAXC) && !defined(__DECC) extern int HTVirtualMemorySize; diff --git a/src/HTAlert.h b/src/HTAlert.h index 018bf503..334843db 100644 --- a/src/HTAlert.h +++ b/src/HTAlert.h @@ -39,7 +39,6 @@ extern void HTUserMsg2 PARAMS((CONST char * Msg, CONST char * Arg)); */ extern void HTProgress PARAMS((CONST char * Msg)); extern void HTReadProgress PARAMS((long bytes, long total)); -extern BOOLEAN mustshow; #define _HTProgress(msg) mustshow = TRUE, HTProgress(msg) /* diff --git a/src/HTFWriter.c b/src/HTFWriter.c index 316bfd02..e446db19 100644 --- a/src/HTFWriter.c +++ b/src/HTFWriter.c @@ -19,9 +19,6 @@ #include <HTFile.h> #include <HTPlain.h> #include <HTFile.h> -#ifdef VMS -#include <HTVMSUtils.h> -#endif /* VMS */ #include <LYStrings.h> #include <LYUtils.h> diff --git a/src/HTML.c b/src/HTML.c index 9ad52f49..881e1a67 100644 --- a/src/HTML.c +++ b/src/HTML.c @@ -49,7 +49,6 @@ #ifdef VMS #include <LYCurses.h> -#include <HTVMSUtils.h> #endif /* VMS */ #ifdef USE_COLOR_STYLE diff --git a/src/LYBookmark.c b/src/LYBookmark.c index 7e8f7276..dc635da3 100644 --- a/src/LYBookmark.c +++ b/src/LYBookmark.c @@ -12,7 +12,6 @@ #include <GridText.h> #ifdef VMS -#include <HTVMSUtils.h> #include <nam.h> extern BOOLEAN HadVMSInterrupt; /* Flag from cleanup_sig() AST */ #endif /* VMS */ @@ -521,22 +520,9 @@ PUBLIC void remove_bookmark_link ARGS2( return; } } -#else /* UNIX */ +#else /* !UNIX */ if (rename(newfile, filename_buffer) != -1) { -#ifdef VMS - char VMSfilename[256]; - /* - * Purge lower version of file. - */ - sprintf(VMSfilename, "%s;-1", filename_buffer); - while (remove(VMSfilename) == 0) - ; - /* - * Reset version number. - */ - sprintf(VMSfilename, "%s;1", filename_buffer); - rename(filename_buffer, VMSfilename); -#endif /* VMS */ + HTSYS_purge(filename_buffer); return; } else { #ifndef VMS diff --git a/src/LYCharUtils.c b/src/LYCharUtils.c index 5b962a93..dd62a239 100644 --- a/src/LYCharUtils.c +++ b/src/LYCharUtils.c @@ -37,13 +37,6 @@ #include <LYCurses.h> #include <LYCookie.h> -#ifdef VMS -#include <HTVMSUtils.h> -#endif /* VMS */ -#ifdef DOSPATH -#include <HTDOS.h> -#endif - #include <LYexit.h> #include <LYLeaks.h> diff --git a/src/LYClean.h b/src/LYClean.h index dbd6a5ad..f19d08e3 100644 --- a/src/LYClean.h +++ b/src/LYClean.h @@ -8,7 +8,6 @@ extern BOOLEAN HadVMSInterrupt; #endif extern void cleanup_sig PARAMS((int sig)); -extern BOOLEAN setup PARAMS((char *terminal)); extern void cleanup NOPARAMS; extern void cleanup_files NOPARAMS; extern void set_alarm PARAMS((int sig)); diff --git a/src/LYCookie.c b/src/LYCookie.c index e7a3d822..2e0b40a2 100644 --- a/src/LYCookie.c +++ b/src/LYCookie.c @@ -501,7 +501,22 @@ PRIVATE void store_cookie ARGS3( * if confirmed or 'allow' is set to always. - FM */ } else if (HTConfirmCookie(de, hostname, co->name, co->value)) { + +#ifdef EXP_PERSISTENT_COOKIES + /* + * If the cookie domain came from persistent cookie file, + * we want to add new cookies to the end of the cookie list + * to maintain their order for servers that need cookies in + * a particular order. This is a hack. + */ + if ((de->bv = FROM_FILE) != 0) { + HTList_appendObject(cookie_list, co); + } else { + HTList_insertObjectAt(cookie_list, co, pos); + } +#else HTList_insertObjectAt(cookie_list, co, pos); +#endif /* EXP_PERSISTENT_COOKIES */ total_cookies++; } else { freeCookie(co); @@ -607,10 +622,27 @@ PRIVATE char * scan_cookie_sublist ARGS6( /* * Check if we should fold the header. - FM */ - if (len > 800) { - StrAllocCat(header, crlftab); - len = 0; - } + + /* + * Section 2.2 of RFC1945 says: + * + * HTTP/1.0 headers may be folded onto multiple lines + * if each continuation line begins with a space or + * horizontal tab. All linear whitespace, including + * folding, has the same semantics as SP. + * [...] + * However, folding of header lines is not expected by + * some applications, and should not be generated by + * HTTP/1.0 applications. + * + * This code was causing problems. Let's not use it. -BJP + */ + + /* if (len > 800) { */ + /* StrAllocCat(header, crlftab); */ + /* len = 0; */ + /* } */ + } /* * Include the cookie name=value pair. @@ -1998,6 +2030,8 @@ PUBLIC void LYStoreCookies ARGS1 ( } } fclose(cookie_handle); + + HTSYS_purge(cookie_file); } #endif diff --git a/src/LYCurses.h b/src/LYCurses.h index 48bea1e5..1a857341 100644 --- a/src/LYCurses.h +++ b/src/LYCurses.h @@ -301,9 +301,7 @@ extern void VTHome NOPARAMS; */ #if USE_COLOR_TABLE extern void LYaddWAttr PARAMS((WINDOW *win, int a)); -extern void LYaddAttr PARAMS((int a)); extern void LYsubWAttr PARAMS((WINDOW *win, int a)); -extern void LYsubAttr PARAMS((int a)); extern void LYaddWAttr PARAMS((WINDOW *win, int a)); extern void LYsubWAttr PARAMS((WINDOW *win, int a)); extern void lynx_set_color PARAMS((int a)); diff --git a/src/LYDownload.c b/src/LYDownload.c index 114adb16..884e436c 100644 --- a/src/LYDownload.c +++ b/src/LYDownload.c @@ -10,12 +10,6 @@ #include <LYClean.h> #include <LYGetFile.h> #include <LYDownload.h> -#ifdef VMS -#include <HTVMSUtils.h> -#endif /* VMS */ -#ifdef DOSPATH -#include <HTDOS.h> -#endif #include <LYexit.h> #include <LYLeaks.h> @@ -273,11 +267,7 @@ check_recall: if (cp) { sprintf(command, "%s/%s", cp, buffer); -#ifdef DOSPATH - strcpy(buffer, HTDOS_name(command)); -#else - strcpy(buffer, command); -#endif + strcpy(buffer, HTSYS_name(command)); } #endif /* VMS */ diff --git a/src/LYEdit.c b/src/LYEdit.c index f433080d..b05a5575 100644 --- a/src/LYEdit.c +++ b/src/LYEdit.c @@ -11,11 +11,7 @@ #include <LYUtils.h> #ifdef VMS #include <unixio.h> -#include <HTVMSUtils.h> #endif /* VMS */ -#ifdef DOSPATH -#include <HTDOS.h> -#endif #include <LYLeaks.h> @@ -69,15 +65,7 @@ PUBLIC int edit_current_file ARGS3( #if defined (DOSPATH) || defined (__EMX__) if (strlen(filename)>1) filename++; #endif -#ifdef DOSPATH - if ((fp = fopen(HTDOS_name(filename),"r")) == NULL) -#else -#ifdef VMS - if ((fp = fopen(HTVMS_name("", filename), "r")) == NULL) -#else - if ((fp = fopen(filename, "r")) == NULL) -#endif /* VMS */ -#endif /* DOSPATH */ + if ((fp = fopen(HTSYS_name(filename), "r")) == NULL) { HTAlert(COULD_NOT_ACCESS_FILE); FREE(filename); @@ -92,15 +80,7 @@ PUBLIC int edit_current_file ARGS3( /* * Don't allow editing if user lacks append access. */ -#ifdef DOSPATH - if ((fp = fopen(HTDOS_name("", filename), "a")) == NULL) -#else -#ifdef VMS - if ((fp = fopen(HTVMS_name("", filename), "a")) == NULL) -#else - if ((fp = fopen(filename, "a")) == NULL) -#endif /* VMS */ -#endif /* DOSPATH */ + if ((fp = fopen(HTSYS_name(filename), "a")) == NULL) { HTUserMsg(NOAUTH_TO_EDIT_FILE); goto failure; @@ -135,21 +115,12 @@ PUBLIC int edit_current_file ARGS3( sprintf(command, "%s +%d \"%s\"", editor, (lineno + (nlinks ? links[cur].ly : 0)), -#ifdef DOSPATH - HTDOS_name(filename)); -#else - filename); -#endif /* DOSPATH */ + HTSYS_name(filename)); else #ifdef __DJGPP__ sprintf(command, "%s %s", editor, HTDOS_name(filename)); #else - sprintf(command, "%s \"%s\"", editor, -#ifdef DOSPATH - HTDOS_name(filename)); -#else - filename); -#endif /* DOSPATH */ + sprintf(command, "%s \"%s\"", editor, HTSYS_name(filename)); #endif /* __DJGPP__ */ #endif /* VMS */ CTRACE(tfp, "LYEdit: %s\n", command); diff --git a/src/LYGetFile.c b/src/LYGetFile.c index 9875372c..21717afd 100644 --- a/src/LYGetFile.c +++ b/src/LYGetFile.c @@ -24,9 +24,6 @@ #include <LYBookmark.h> #include <LYMap.h> #include <LYList.h> -#ifdef VMS -#include <HTVMSUtils.h> -#endif /* VMS */ #ifdef DIRED_SUPPORT #include <LYLocal.h> #endif /* DIRED_SUPPORT */ @@ -242,9 +239,11 @@ Try_Redirected_URL: } else if (url_type == LYNXPRINT_URL_TYPE) { return(printfile(doc)); +#ifndef NO_OPTION_FORMS } else if (url_type == LYNXOPTIONS_URL_TYPE) { /* forms-based options menu */ return(postoptions(doc)); +#endif } else if (url_type == NEWSPOST_URL_TYPE || url_type == NEWSREPLY_URL_TYPE || diff --git a/src/LYGlobalDefs.h b/src/LYGlobalDefs.h index 92db467a..3960b9f1 100644 --- a/src/LYGlobalDefs.h +++ b/src/LYGlobalDefs.h @@ -111,8 +111,10 @@ extern int LYShowColor; /* Show color or monochrome? */ extern int LYChosenShowColor; /* extended color/monochrome choice */ extern int LYrcShowColor; /* ... as read or last written */ -#ifndef EXP_FORMS_OPTIONS +#if !defined(NO_OPTION_FORMS) && !defined(NO_OPTION_MENU) extern BOOLEAN LYUseFormsOptions; /* use Forms-based options menu */ +#else +#define LYUseFormsOptions FALSE /* simplify ifdef'ing in LYMainLoop.c */ #endif extern BOOLEAN LYShowCursor; /* Show the cursor or hide it? */ extern BOOLEAN verbose_img; /* display filenames of images? */ @@ -168,7 +170,6 @@ extern BOOLEAN telnet_ok; extern BOOLEAN news_ok; extern BOOLEAN ftp_ok; extern BOOLEAN rlogin_ok; -extern BOOLEAN no_print; /* TRUE to disable printing */ extern BOOLEAN system_editor; /* True if locked-down editor */ extern BOOLEAN child_lynx; /* TRUE to exit with an arrow */ extern BOOLEAN error_logging; /* TRUE to mail error messages */ @@ -177,7 +178,6 @@ extern BOOLEAN vi_keys; /* TRUE to turn on vi-like key movement */ extern BOOLEAN emacs_keys; /* TRUE to turn on emacs-like key movement */ extern int keypad_mode; /* is set to either NUMBERS_AS_ARROWS * * or LINKS_ARE_NUMBERED */ -extern BOOLEAN verbose_links; /* TRUE if links are preceded by (LINK) */ extern BOOLEAN case_sensitive; /* TRUE to turn on case sensitive search */ extern BOOLEAN no_inside_telnet; /* this and following are restrictions */ extern BOOLEAN no_outside_telnet; @@ -195,8 +195,8 @@ extern BOOLEAN no_bookmark; extern BOOLEAN no_multibook; extern BOOLEAN no_bookmark_exec; extern BOOLEAN no_option_save; -extern BOOLEAN no_print; extern BOOLEAN no_download; +extern BOOLEAN no_print; /* TRUE to disable printing */ extern BOOLEAN no_disk_save; extern BOOLEAN no_exec; extern BOOLEAN no_lynxcgi; diff --git a/src/LYLeaks.c b/src/LYLeaks.c index bb41b9ad..87afc0bb 100644 --- a/src/LYLeaks.c +++ b/src/LYLeaks.c @@ -155,22 +155,8 @@ PUBLIC void LYLeaks NOARGS fprintf(Fp_leakagesink, "\nTotal memory leakage this run:\t%u\n", (unsigned)st_total); fclose(Fp_leakagesink); -#ifdef VMS - { - char VMSfilename[256]; - /* - * Purge lower versions of the file. - */ - sprintf(VMSfilename, "%s;-1", LEAKAGE_SINK); - while (remove(VMSfilename) == 0) - ; - /* - * Reset version number. - */ - sprintf(VMSfilename, "%s;1", LEAKAGE_SINK); - rename(LEAKAGE_SINK, VMSfilename); - } -#endif /* VMS */ + + HTSYS_purge(LEAKAGE_SINK); } /* diff --git a/src/LYMain.c b/src/LYMain.c index 25ba5b70..4b7447c3 100644 --- a/src/LYMain.c +++ b/src/LYMain.c @@ -6,9 +6,6 @@ #include <HTFile.h> #include <UCMap.h> #include <UCDefs.h> -#ifdef VMS -#include <HTVMSUtils.h> -#endif /* VMS */ #include <HTInit.h> #include <LYCurses.h> #include <LYStyle.h> @@ -150,8 +147,8 @@ PUBLIC int port_syntax = 1; PUBLIC int LYShowColor = SHOW_COLOR_UNKNOWN; /* to show or not to show */ PUBLIC int LYChosenShowColor = SHOW_COLOR_UNKNOWN; /* whether to show and save */ PUBLIC int LYrcShowColor = SHOW_COLOR_UNKNOWN; /* ... as last read or written */ -#ifndef EXP_FORMS_OPTIONS -PUBLIC BOOLEAN LYUseFormsOptions = FALSE; /* use forms-based options menu */ +#if !defined(NO_OPTION_FORMS) && !defined(NO_OPTION_MENU) +PUBLIC BOOLEAN LYUseFormsOptions = TRUE; /* use forms-based options menu */ #endif PUBLIC BOOLEAN LYShowCursor = SHOW_CURSOR; /* to show or not to show */ PUBLIC BOOLEAN verbose_img = VERBOSE_IMAGES; /* show filenames or not */ @@ -187,7 +184,6 @@ PUBLIC BOOLEAN check_mail = CHECKMAIL; PUBLIC BOOLEAN vi_keys = VI_KEYS_ALWAYS_ON; PUBLIC BOOLEAN emacs_keys = EMACS_KEYS_ALWAYS_ON; PUBLIC int keypad_mode = DEFAULT_KEYPAD_MODE; -PUBLIC BOOLEAN verbose_links = VERBOSE_LINKS; PUBLIC BOOLEAN case_sensitive = CASE_SENSITIVE_ALWAYS_ON; PUBLIC BOOLEAN telnet_ok = TRUE; PUBLIC BOOLEAN news_ok = TRUE; @@ -683,22 +679,29 @@ PUBLIC int main ARGS2( StrAllocCat(lynx_version_putenv_command, LYNX_VERSION); putenv(lynx_version_putenv_command); #endif /* VMS */ + if ((cp = getenv("LYNX_TEMP_SPACE")) != NULL) StrAllocCopy(lynx_temp_space, cp); - else -#if defined (DOSPATH) || defined (__EMX__) - if ((cp = getenv("TEMP")) != NULL) +#if defined (UNIX) + else if ((cp = getenv("TMPDIR")) != NULL) StrAllocCopy(lynx_temp_space, cp); +#endif +#if defined (DOSPATH) || defined (__EMX__) + else if ((cp = getenv("TEMP")) != NULL) + StrAllocCopy(lynx_temp_space, HTDOS_name(cp)); else if ((cp = getenv("TMP")) != NULL) - StrAllocCopy(lynx_temp_space, cp); + StrAllocCopy(lynx_temp_space, HTDOS_name(cp)); +#endif else +#ifdef TEMP_SPACE + StrAllocCopy(lynx_temp_space, TEMP_SPACE); +#else { printf("You MUST define a valid TMP or TEMP area!\n"); exit(-1); } -#else - StrAllocCopy(lynx_temp_space, TEMP_SPACE); #endif + if ((cp = strchr(lynx_temp_space, '~'))) { *(cp++) = '\0'; StrAllocCopy(temp, lynx_temp_space); @@ -1037,8 +1040,7 @@ PUBLIC int main ARGS2( } #ifdef VMS LYCloseTracelog(); - while (remove(LYTraceLogPath) == 0) - ; + HTSYS_remove(LYTraceLogPath); if ((LYTraceLogFP = LYNewTxtFile(LYTraceLogPath)) == NULL) { WWW_TraceFlag = FALSE; printf("%s\n", TRACELOG_OPEN_FAILED); @@ -2645,10 +2647,10 @@ keys (may be incompatible with some curses packages)" "from", TOGGLE_ARG, &LYNoFromHeader, "toggle transmissions of From headers" ), -#ifndef EXP_FORMS_OPTIONS +#if !defined(NO_OPTION_FORMS) && !defined(NO_OPTION_MENU) PARSE_SET( "forms_options", TOGGLE_ARG, &LYUseFormsOptions, - "toggles forcing of forms-based options menu style" + "toggles forms-based vs old-style options menu" ), #endif PARSE_SET( diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c index 46ec32e3..7b830ad2 100644 --- a/src/LYMainLoop.c +++ b/src/LYMainLoop.c @@ -46,10 +46,6 @@ #include <io.h> #endif -#ifdef VMS -#include <HTVMSUtils.h> -#endif /* VMS */ - #ifdef DIRED_SUPPORT #include <LYLocal.h> #include <LYUpload.h> @@ -202,7 +198,7 @@ int mainloop NOARGS BOOLEAN vi_keys_flag = vi_keys; BOOLEAN emacs_keys_flag = emacs_keys; BOOLEAN LYRawMode_flag = LYRawMode; -#ifndef EXP_FORMS_OPTIONS +#ifndef NO_OPTION_MENU BOOLEAN LYSelectPopups_flag = LYSelectPopups; BOOLEAN verbose_img_flag = verbose_img; BOOLEAN keypad_mode_flag = keypad_mode; @@ -3721,7 +3717,7 @@ check_goto_URL: #ifdef DIRED_SUPPORT c = dir_list_style; #endif /* DIRED_SUPPORT */ -#ifndef EXP_FORMS_OPTIONS +#ifndef NO_OPTION_MENU if (!LYUseFormsOptions) { LYoptions(); /* do the old-style options stuff */ @@ -3820,7 +3816,8 @@ if (!LYUseFormsOptions) { refresh_screen = TRUE; /* to repaint screen */ break; } /* end if !LYUseFormsOptions */ -#endif /* !EXP_FORMS_OPTIONS */ +#endif /* !NO_OPTION_MENU */ +#ifndef NO_OPTION_FORMS /* * FIXME: Blatantly stolen from LYK_PRINT below. * how much is really valid here? I don't know the @@ -3852,6 +3849,7 @@ if (!LYUseFormsOptions) { */ HTuncache_current_document(); } +#endif /* NO_OPTION_FORMS */ break; case LYK_INDEX_SEARCH: /* search for a user string */ @@ -5073,8 +5071,7 @@ check_add_bookmark_to_self: } #ifdef VMS LYCloseTracelog(); - while (remove(LYTraceLogPath) == 0) - ; + HTSYS_remove(LYTraceLogPath); if ((LYTraceLogFP = LYNewTxtFile(LYTraceLogPath)) == NULL) { TracelogOpenFailed(); break; diff --git a/src/LYOptions.c b/src/LYOptions.c index fa59d8fb..f86fad24 100644 --- a/src/LYOptions.c +++ b/src/LYOptions.c @@ -27,7 +27,7 @@ BOOLEAN term_options; PRIVATE void terminate_options PARAMS((int sig)); -#ifndef EXP_FORMS_OPTIONS +#ifndef NO_OPTION_MENU PRIVATE int boolean_choice PARAMS(( int status, int line, @@ -1789,7 +1789,7 @@ PRIVATE int boolean_choice ARGS4( } } } -#endif /* !EXP_FORMS_OPTIONS */ +#endif /* !NO_OPTION_MENU */ PRIVATE void terminate_options ARGS1( int, sig GCC_UNUSED) @@ -2096,7 +2096,7 @@ draw_bookmark_list: signal(SIGINT, cleanup_sig); } -#ifndef EXP_FORMS_OPTIONS +#ifndef NO_OPTION_MENU /* ** This function prompts for a choice or page number. ** If a 'g' or 'p' suffix is included, that will be @@ -3127,7 +3127,9 @@ restore_popup_statusline: } } -#endif /* !EXP_FORMS_OPTIONS */ +#endif /* !NO_OPTION_MENU */ + +#ifndef NO_OPTION_FORMS /* * I'm paranoid about mistyping strings. Also, this way they get combined @@ -4113,3 +4115,4 @@ PUBLIC int gen_options ARGS1( LYCloseTempFP(fp0); return(0); } +#endif /* !NO_OPTION_FORMS */ diff --git a/src/LYOptions.h b/src/LYOptions.h index 2752bde8..c8fdccbd 100644 --- a/src/LYOptions.h +++ b/src/LYOptions.h @@ -7,11 +7,13 @@ extern BOOLEAN term_options; /* for LYgetstr() */ extern void edit_bookmarks NOPARAMS; +#ifndef NO_OPTION_FORMS extern int postoptions PARAMS((document *newdoc)); extern int gen_options PARAMS((char **newfile)); +#endif /* !NO_OPTION_FORMS */ -#ifndef EXP_FORMS_OPTIONS +#ifndef NO_OPTION_MENU extern void LYoptions NOPARAMS; -#endif /* !EXP_FORMS_OPTIONS */ +#endif /* !NO_OPTION_MENU */ #endif /* LYOPTIONS_H */ diff --git a/src/LYPrint.c b/src/LYPrint.c index c4eea6e0..8c4415d0 100644 --- a/src/LYPrint.c +++ b/src/LYPrint.c @@ -15,12 +15,6 @@ #include <LYHistory.h> #include <LYList.h> #include <LYCharSets.h> /* To get current charset for mail header. */ -#ifdef VMS -#include <HTVMSUtils.h> -#endif /* VMS */ -#ifdef DOSPATH -#include <HTDOS.h> -#endif #include <LYLeaks.h> @@ -407,17 +401,9 @@ PUBLIC int printfile ARGS1( LYTrimPathSep(cp); if (cp) -#ifdef DOSPATH - sprintf(buffer, "%s/%s", cp, HTDOS_name(filename)); -#else - sprintf(buffer, "%s/%s", cp, filename); -#endif + sprintf(buffer, "%s/%s", cp, HTSYS_name(filename)); else -#ifdef DOSPATH - strcpy(buffer, HTDOS_name(filename)); -#else - strcpy(buffer, filename); -#endif + strcpy(buffer, HTSYS_name(filename)); #endif /* VMS */ /* diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c index 551f6219..8b823e84 100644 --- a/src/LYReadCFG.c +++ b/src/LYReadCFG.c @@ -836,7 +836,7 @@ static Config_Type Config_Table [] = PARSE_ENV("finger_proxy", CONF_ENV, 0 ), PARSE_SET("force_8bit_toupper", CONF_BOOL, UCForce8bitTOUPPER), PARSE_SET("force_ssl_cookies_secure", CONF_BOOL, LYForceSSLCookiesSecure), -#ifndef EXP_FORMS_OPTIONS +#if !defined(NO_OPTION_FORMS) && !defined(NO_OPTION_MENU) PARSE_SET("forms_options", CONF_BOOL, LYUseFormsOptions), #endif PARSE_ENV("ftp_proxy", CONF_ENV, 0 ), @@ -950,7 +950,6 @@ static Config_Type Config_Table [] = #endif PARSE_SET("use_select_popups", CONF_BOOL, LYSelectPopups), PARSE_SET("verbose_images", CONF_BOOL, verbose_img), - PARSE_SET("verbose_links", CONF_BOOL, verbose_links), PARSE_SET("vi_keys_always_on", CONF_BOOL, vi_keys), PARSE_FUN("viewer", CONF_FUN, viewer_fun), PARSE_ENV("wais_proxy", CONF_ENV, 0 ), @@ -1238,23 +1237,27 @@ PUBLIC char *lynx_cfg_infopage NOARGS LYforce_no_cache = TRUE; /* don't cache this doc */ + BeginInternalPage (fp0, LYNXCFG_TITLE, NULL); + fprintf(fp0, "<pre>\n"); + +#ifndef NO_CONFIG_INFO + fprintf(fp0, "<em>This is read from your lynx.cfg file,\n"); #if defined(HAVE_CONFIG_H) || defined(VMS) StrAllocCopy(temp, LYNX_CFG_FILE); #else - StrAllocCopy(temp, helpfilepath); /* FIXME: no absolute path */ + StrAllocCopy(temp, helpfilepath); /* no absolute path... */ StrAllocCat(temp, LYNXCFG_HELP); /* for lynx.cfg on DOS/Win32 */ #endif /* HAVE_CONFIG_H */ - - BeginInternalPage (fp0, LYNXCFG_TITLE, NULL); - fprintf(fp0, "<pre>\n"); - fprintf(fp0, "<em>This is read from your lynx.cfg file,\n"); - fprintf(fp0, "please \"read\" distribution's <a href=\"%s\">lynx.cfg", temp); fprintf(fp0, "</a> for more comments.</em>\n\n"); fprintf(fp0, " #<em>Your primary configuration %s</em>\n", lynx_cfg_file); +#else + fprintf(fp0, "<em>This is read from your lynx.cfg file:</em>\n\n"); +#endif /* NO_CONFIG_INFO */ + /* * Process the configuration file. */ diff --git a/src/LYShowInfo.c b/src/LYShowInfo.c index ca01bf9e..f5439ed7 100644 --- a/src/LYShowInfo.c +++ b/src/LYShowInfo.c @@ -23,7 +23,7 @@ #include <LYLocal.h> #endif /* DIRED_SUPPORT */ -#ifdef HAVE_CONFIG_H +#ifndef NO_CONFIG_INFO #define HAVE_CFG_DEFS_H #define PutDefs(table, N) fprintf(fp0, "%-35s %s\n", table[N].name, table[N].value) @@ -68,7 +68,7 @@ PRIVATE char *lynx_compile_opts NOARGS } #else #undef HAVE_CFG_DEFS_H -#endif /* HAVE_CONFIG_H */ +#endif /* !NO_CONFIG_INFO */ /* * Showinfo prints a page of info about the current file and the link diff --git a/src/LYUtils.c b/src/LYUtils.c index ff01e020..3ed0f848 100644 --- a/src/LYUtils.c +++ b/src/LYUtils.c @@ -14,20 +14,18 @@ #include <LYCharSets.h> #include <LYCharUtils.h> -#if defined(DOSPATH) || defined(__EMX__) -#include <HTDOS.h> -#endif #ifdef DJGPP_KEYHANDLER #include <bios.h> #endif /* DJGPP_KEYHANDLER */ + #ifdef DISP_PARTIAL #include <LYKeymap.h> #endif /* DISP_PARTIAL */ + #ifdef VMS #include <descrip.h> #include <libclidef.h> #include <lib$routines.h> -#include <HTVMSUtils.h> #endif /* VMS */ #if HAVE_UTMP @@ -5796,11 +5794,7 @@ PUBLIC void LYRemoveTemp ARGS1( } else { ly_temp = p->next; } - code = remove(name); -#ifdef VMS - while (remove(name) == 0) - ; -#endif + code = HTSYS_remove(name); CTRACE(tfp, "...LYRemoveTemp done(%d)%s\n", code, (p->file != 0) ? ", closed" : ""); CTRACE_FLUSH(tfp); diff --git a/src/LYUtils.h b/src/LYUtils.h index 46d5d93c..5c4ab08e 100644 --- a/src/LYUtils.h +++ b/src/LYUtils.h @@ -5,6 +5,30 @@ #include <HTList.h> #endif /* HTLIST_H */ +#ifdef VMS +#include <HTVMSUtils.h> +#define HTSYS_name(path) HTVMS_name("", path) +#define HTSYS_purge(path) HTVMS_purge(path) +#define HTSYS_remove(path) HTVMS_remove(path) +#endif /* VMS */ + +#if defined(DOSPATH) || defined(__EMX__) +#include <HTDOS.h> +#define HTSYS_name(path) HTDOS_name(path) +#endif + +#ifndef HTSYS_name +#define HTSYS_name(path) path +#endif + +#ifndef HTSYS_purge +#define HTSYS_purge(path) /*nothing*/ +#endif + +#ifndef HTSYS_remove +#define HTSYS_remove(path) remove(path) +#endif + #ifdef DOSPATH #define LYIsPathSep(ch) ((ch) == '/' || (ch) == '\\') #else diff --git a/src/LYrcFile.c b/src/LYrcFile.c index 8c4faa3f..f2b4a2a7 100644 --- a/src/LYrcFile.c +++ b/src/LYrcFile.c @@ -1005,16 +1005,7 @@ PUBLIC int save_rc NOPARAMS */ fclose(fp); -#ifdef VMS - /* - * Get rid of any copies of the .lynxrc file that VMS creates. - */ - while (remove("sys$login:.lynxrc;-1") == 0) ; - /* - * Reset version number. - */ - rename("sys$login:.lynxrc", "sys$login:.lynxrc;1"); -#endif /* VMS */ + HTSYS_purge(rcfile); - return TRUE; + return TRUE; } diff --git a/userdefs.h b/userdefs.h index 921bea7b..859b1bfb 100644 --- a/userdefs.h +++ b/userdefs.h @@ -891,14 +891,6 @@ #define VERBOSE_IMAGES TRUE /****************************** -* VERBOSE_LINKS controls whether Lynx precedes links with the string "(LINK)", -* which is done to accommodate blind users. -* -* If this option is set here, it will override the setting in userdefs.h. -*/ -#define VERBOSE_LINKS FALSE - -/****************************** * BOXVERT and BOXHORI control the layout of popup menus. Set to 0 if your * curses supports line-drawing characters, set to '*' or any other character * to not use line-drawing (e.g., '|' for vertical and '-' for horizontal). @@ -1224,12 +1216,12 @@ * the version definition with the Project Version on checkout. Just * ignore it. - kw */ /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */ -#define LYNX_VERSION "2.8.1pre.9" +#define LYNX_VERSION "2.8.1pre.10" #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 "Sat, 10 Oct 1998 14:53:16 -0600" +#define LYNX_DATE "Wed, 14 Oct 1998 06:23:56 -0600" #define LYNX_DATE_OFF 5 /* truncate the automatically-generated date */ #define LYNX_DATE_LEN 11 /* truncate the automatically-generated date */ #define LYNX_RELEASE_DATE "1998" |