diff options
35 files changed, 1407 insertions, 936 deletions
diff --git a/CHANGES b/CHANGES index 60a16c10..7837adbb 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,54 @@ Changes since Lynx 2.8 release =============================================================================== +2001-10-06 (2.8.5dev.3) +* add CF_MKSTEMP configure macro, from vile, to check for a working mkstemp(). + This will quiet some bogus warning messages in recent runtime support, but + (see 2.8.3) does not affect the security of temporary files in lynx -TD +* updated CF_PATH_SYNTAX configure macro, from vile, to handle leading "\\" in + a win32 pathname -TD +* for configurations that provide scrollbar, add a checkbox to the Options menu + to enable or disable it -TD +* modify LYGetHostByName() in HTTCP.c to use the threaded _WINDOWS_NSL code for + all Cygwin machines. The ability to interrupt nameserver lookup has not + worked in Win98 using the Cygwin port, despite defining _WINDOWS_NSL. It + looks like the threaded code was only for WinNT. At least under Cygwin, that + code also seems to work fine under Win98 -DK +* add FIELDS_ARE_NUMBERED as a possible value for DEFAULT_KEYPAD_MODE in + lynx.cfg as well as keypad_mode in .lynxrc -TD +* add NUMBER_FIELDS_ON_LEFT and NUMBER_LINKS_ON_LEFT to lynx.cfg, use these to + control where field- and link-numbering is placed. Caveat: there are some + cases where fields that do popup's are truncated, e.g., in the Options menu, + when right-alignment is used -TD +* support for DJGPP's two forms of file addressing, [a-zA-Z]:[/\\] and + /dev/[a-zA-z]/ -DK +* add samples/lynxdump script, to illustrate how to use lynx -dump with no + link references (prompted by discussion with LV) -TD +* add samples/keepviewer script, to illustrate how to retain a temporary file + for use in an external viewer -TD +* add ifdef's in is_url() to avoid recognizing URLs if they are disabled in the + given configuration, i.e., bibp, finger, ftp, gopher, news (report by + Frederic L W Meunier) -TD +* modify LYrefresh() to take into account whether a popup window exists, so + that a search prompt will not overwrite a popup. This bug was introduced by + the curses pads (reported by Felicia Neff <neff@panix.com> and Fr3dY + <fr3dy@retemail.es>) -TD +* add note in keystroke_help.html about CTRL-V as literal-next (lnext) for + users who are unfamiliar with stty -TD +* add NcFTP-style ftp-URLs which are supported by Netscape and wget (request + by Martin Mokrejs) -TD +* add traces in LYReadCFG.c and LYrcFile.c to report lines which are not found + in the symbol table, to help diagnose when a user adds lynx.cfg information + to .lynxrc -TD +* define additional -trace-mask option, 8=config -TD +* modify LYtouchline() to avoid using wredrawln() for ncurses, since the + LYwin variable may be a pad much wider than the screen, which is not handled + properly (report by Karl Eichwalder <keichwa@gmx.net>) -TD +* correct beginning configure script, which was supposed to remove + config.cache, but did not, due to a misplaced line when it was added + 1998-06-04 (prompted by a report by Fr3dY <fr3dy@retemail.es> that the + checks for srand/rand did not work) -TD + 2001-08-15 (2.8.5dev.2) * several small fixes to HTFile.c to make directory listings work properly on win32, e.g., stat'ing a directory with a trailing slash fails (reported by diff --git a/WWW/Library/Implementation/HTDOS.c b/WWW/Library/Implementation/HTDOS.c index 5313f1e5..0d943a25 100644 --- a/WWW/Library/Implementation/HTDOS.c +++ b/WWW/Library/Implementation/HTDOS.c @@ -67,8 +67,10 @@ char * HTDOS_wwwName ARGS1(CONST char *, dosname) if (wwwname_len > 1) cp_url--; /* point last char */ - if (wwwname_len > 3 && *cp_url == '/') + if (wwwname_len > 3 && *cp_url == '/') { + cp_url++; *cp_url = '\0'; + } #ifdef NOTUSED if(*cp_url == ':') { @@ -99,6 +101,16 @@ char * HTDOS_name ARGS1(char *, wwwname) int joe; copy_plus(&result, wwwname); +#ifdef __DJGPP__ + if (result[0] == '/' + && result[1] == 'd' + && result[2] == 'e' + && result[3] == 'v' + && result[4] == '/' + && isalpha(result[5])) { + return(result); + } +#endif /* __DJGPP__ */ for (joe = 0; result[joe] != '\0'; joe++) { if (result[joe] == '/') { diff --git a/WWW/Library/Implementation/HTFTP.c b/WWW/Library/Implementation/HTFTP.c index 8cd3099c..4f279fab 100644 --- a/WWW/Library/Implementation/HTFTP.c +++ b/WWW/Library/Implementation/HTFTP.c @@ -363,6 +363,7 @@ PRIVATE char *help_message_cache_non_empty NOARGS { return(help_message_buffer); } + PRIVATE char *help_message_cache_contents NOARGS { return(help_message_buffer); @@ -795,8 +796,8 @@ PRIVATE int get_connection ARGS2( return status; /* Bad return */ } - CTRACE((tfp, "FTP connected, socket %d control %ld\n", - con->socket, (long)con)); + CTRACE((tfp, "FTP connected, socket %d control %p\n", + con->socket, con)); control = con; /* Current control connection */ /* Initialise buffering for control connection */ @@ -2936,6 +2937,8 @@ PUBLIC int HTFTPLoad ARGS4( get to the point of reading data - kw */ HTFormat format; + CTRACE((tfp, "HTFTPLoad(%s) %s connection\n", name, ftp_passive ? "passive" : "normal")); + /* set use_list to NOT since we don't know what kind of server * this is yet. And set the type to GENERIC */ diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c index fd916955..6660ee4a 100644 --- a/WWW/Library/Implementation/HTTCP.c +++ b/WWW/Library/Implementation/HTTCP.c @@ -1089,6 +1089,7 @@ PUBLIC struct hostent * LYGetHostByName ARGS1( { HANDLE hThread, dwThreadID; +#ifndef __CYGWIN__ if (!system_is_NT) { /* for Windows9x */ unsigned long t; t = (unsigned long)inet_addr(host); @@ -1097,6 +1098,7 @@ PUBLIC struct hostent * LYGetHostByName ARGS1( else phost = gethostbyname(host); } else { /* for Windows NT */ +#endif /* !__CYGWIN__ */ phost = (struct hostent *) NULL; donelookup = FALSE; hThread = CreateThread((void *)NULL, 4096UL, @@ -1118,7 +1120,9 @@ PUBLIC struct hostent * LYGetHostByName ARGS1( return NULL; } } +#ifndef __CYGWIN__ } +#endif /* !__CYGWIN__ */ if (phost) { lynx_nsl_status = HT_OK; result_phost = phost; diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c index 51450145..3562801e 100644 --- a/WWW/Library/Implementation/HTTP.c +++ b/WWW/Library/Implementation/HTTP.c @@ -675,6 +675,16 @@ use_tunnel: first_Accept = FALSE; len = 0; + /* + * FIXME: suppressing the "Accept-Encoding" in this case is done to work + * around limitations of the presentation logic used for the command-line + * "-base" option. The remote site may transmit the document gzip'd, but + * the ensuing logic in HTSaveToFile() would see the mime-type as gzip + * rather than text/html, and not prepend the base URL. This is less + * efficient than accepting the compressed data and uncompressing it, + * adding the base URL but is simpler than augmenting the dump's + * presentation logic -TD + */ if (!LYPrependBaseToSource) HTSprintf(&command, "Accept-Encoding: %s, %s%c%c", "gzip", "compress", CR, LF); diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h index 8172a750..e038e1b7 100644 --- a/WWW/Library/Implementation/HTUtils.h +++ b/WWW/Library/Implementation/HTUtils.h @@ -501,6 +501,7 @@ extern int WWW_TraceMask; #define TRACE_SGML (TRACE_bit(0)) #define TRACE_STYLE (TRACE_bit(1)) #define TRACE_TRST (TRACE_bit(2)) +#define TRACE_CFG (TRACE_bit(3)) #if defined(LY_TRACELINE) #define LY_SHOWWHERE fprintf( tfp, "%s: %d: ", __FILE__, LY_TRACELINE ), diff --git a/aclocal.m4 b/aclocal.m4 index 85a8eba3..638a8c90 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1885,6 +1885,46 @@ AC_MSG_RESULT($cf_cv_locale) test $cf_cv_locale = yes && AC_DEFINE(LOCALE) ]) dnl --------------------------------------------------------------------------- +dnl Check for a working mkstemp +AC_DEFUN([CF_MKSTEMP],[ +AC_CACHE_CHECK(for working mkstemp, cf_cv_func_mkstemp,[ +rm -f conftest* +AC_TRY_RUN([ +#include <sys/types.h> +#include <stdlib.h> +#include <stdio.h> +#include <sys/stat.h> +int main() +{ + char *tmpl = "conftestXXXXXX"; + char temp[80]; + int result = 0; + int fd; + struct stat sb; + + umask(077); + strcpy(temp, tmpl); + if ((fd = mkstemp(temp)) >= 0) { + if (!strcmp(temp, tmpl) + || stat(temp, &sb) != 0 + || (sb.st_mode & S_IFMT) != S_IFREG + || (sb.st_mode & 077) != 0) { + result = 1; + } + close(fd); + } + exit(result); +} +],[cf_cv_func_mkstemp=yes +],[cf_cv_func_mkstemp=no +],[AC_CHECK_FUNC(mkstemp) +]) +]) +if test "$cf_cv_func_mkstemp" = yes ; then + AC_DEFINE(HAVE_MKSTEMP) +fi +])dnl +dnl --------------------------------------------------------------------------- dnl Write a debug message to config.log, along with the line number in the dnl configure script. AC_DEFUN([CF_MSG_LOG],[ @@ -2274,11 +2314,13 @@ test -n "$cf_path_args" && AC_DEFINE_UNQUOTED($1_ARGS,"$cf_path_args") dnl --------------------------------------------------------------------------- dnl Check the argument to see that it looks like a pathname. Rewrite it if it dnl begins with one of the prefix/exec_prefix variables, and then again if the -dnl result begins with 'NONE'. This is necessary to workaround autoconf's +dnl result begins with 'NONE'. This is necessary to work around autoconf's dnl delayed evaluation of those symbols. AC_DEFUN([CF_PATH_SYNTAX],[ case ".[$]$1" in #(vi -./*) #(vi +.\[$]\(*\)*|.\'*\'*) #(vi + ;; +..|./*|.\\*) #(vi ;; .[[a-zA-Z]]:[[\\/]]*) #(vi OS/2 EMX ;; @@ -2294,7 +2336,7 @@ case ".[$]$1" in #(vi $1=`echo [$]$1 | sed -e s@NONE@$ac_default_prefix@` ;; *) - AC_ERROR(expected a pathname, not "[$]$1") + AC_ERROR([expected a pathname, not \"[$]$1\"]) ;; esac ])dnl diff --git a/configure b/configure index 9f7e76f2..b16d726f 100755 --- a/configure +++ b/configure @@ -613,9 +613,9 @@ else fi +rm -f config.cache; touch config.cache CONFIG_H=lynx_cfg.h - ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -4003,7 +4003,9 @@ else fi case ".$withval" in #(vi -./*) #(vi +.\$\(*\)*|.\'*\'*) #(vi + ;; +..|./*|.\\*) #(vi ;; .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX ;; @@ -4019,7 +4021,7 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s@NONE@$ac_default_prefix@` ;; *) - { echo "configure: error: expected a pathname" 1>&2; exit 1; } + { echo "configure: error: expected a pathname, not \"$withval\"" 1>&2; exit 1; } ;; esac @@ -4027,7 +4029,7 @@ eval NLS_DATADIR="$withval" echo $ac_n "checking if you want full utility pathnames""... $ac_c" 1>&6 -echo "configure:4031: checking if you want full utility pathnames" >&5 +echo "configure:4033: 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 @@ -4052,7 +4054,7 @@ EOF echo $ac_n "checking for system mailer""... $ac_c" 1>&6 -echo "configure:4056: checking for system mailer" >&5 +echo "configure:4058: 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 @@ -4079,7 +4081,7 @@ EOF echo $ac_n "checking system mail flags""... $ac_c" 1>&6 -echo "configure:4083: checking system mail flags" >&5 +echo "configure:4085: 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 @@ -4107,7 +4109,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:4111: checking for $ac_word" >&5 +echo "configure:4113: 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 @@ -4142,7 +4144,7 @@ fi else echo $ac_n "checking for chmod""... $ac_c" 1>&6 -echo "configure:4146: checking for chmod" >&5 +echo "configure:4148: checking for chmod" >&5 echo "$ac_t""$CHMOD" 1>&6 eval 'ac_cv_path_'CHMOD'="'chmod'"' fi @@ -4184,7 +4186,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:4188: checking for $ac_word" >&5 +echo "configure:4190: 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 @@ -4219,7 +4221,7 @@ fi else echo $ac_n "checking for compress""... $ac_c" 1>&6 -echo "configure:4223: checking for compress" >&5 +echo "configure:4225: checking for compress" >&5 echo "$ac_t""$COMPRESS" 1>&6 eval 'ac_cv_path_'COMPRESS'="'compress'"' fi @@ -4261,7 +4263,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:4265: checking for $ac_word" >&5 +echo "configure:4267: 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 @@ -4296,7 +4298,7 @@ fi else echo $ac_n "checking for cp""... $ac_c" 1>&6 -echo "configure:4300: checking for cp" >&5 +echo "configure:4302: checking for cp" >&5 echo "$ac_t""$COPY" 1>&6 eval 'ac_cv_path_'COPY'="'cp'"' fi @@ -4338,7 +4340,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:4342: checking for $ac_word" >&5 +echo "configure:4344: 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 @@ -4373,7 +4375,7 @@ fi else echo $ac_n "checking for gzip""... $ac_c" 1>&6 -echo "configure:4377: checking for gzip" >&5 +echo "configure:4379: checking for gzip" >&5 echo "$ac_t""$GZIP" 1>&6 eval 'ac_cv_path_'GZIP'="'gzip'"' fi @@ -4415,7 +4417,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:4419: checking for $ac_word" >&5 +echo "configure:4421: 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 @@ -4450,7 +4452,7 @@ fi else echo $ac_n "checking for mkdir""... $ac_c" 1>&6 -echo "configure:4454: checking for mkdir" >&5 +echo "configure:4456: checking for mkdir" >&5 echo "$ac_t""$MKDIR" 1>&6 eval 'ac_cv_path_'MKDIR'="'mkdir'"' fi @@ -4492,7 +4494,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:4496: checking for $ac_word" >&5 +echo "configure:4498: 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 @@ -4527,7 +4529,7 @@ fi else echo $ac_n "checking for mv""... $ac_c" 1>&6 -echo "configure:4531: checking for mv" >&5 +echo "configure:4533: checking for mv" >&5 echo "$ac_t""$MV" 1>&6 eval 'ac_cv_path_'MV'="'mv'"' fi @@ -4569,7 +4571,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:4573: checking for $ac_word" >&5 +echo "configure:4575: 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 @@ -4604,7 +4606,7 @@ fi else echo $ac_n "checking for rm""... $ac_c" 1>&6 -echo "configure:4608: checking for rm" >&5 +echo "configure:4610: checking for rm" >&5 echo "$ac_t""$RM" 1>&6 eval 'ac_cv_path_'RM'="'rm'"' fi @@ -4646,7 +4648,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:4650: checking for $ac_word" >&5 +echo "configure:4652: 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 @@ -4681,7 +4683,7 @@ fi else echo $ac_n "checking for tar""... $ac_c" 1>&6 -echo "configure:4685: checking for tar" >&5 +echo "configure:4687: checking for tar" >&5 echo "$ac_t""$TAR" 1>&6 eval 'ac_cv_path_'TAR'="'tar'"' fi @@ -4723,7 +4725,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:4727: checking for $ac_word" >&5 +echo "configure:4729: 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 @@ -4758,7 +4760,7 @@ fi else echo $ac_n "checking for touch""... $ac_c" 1>&6 -echo "configure:4762: checking for touch" >&5 +echo "configure:4764: checking for touch" >&5 echo "$ac_t""$TOUCH" 1>&6 eval 'ac_cv_path_'TOUCH'="'touch'"' fi @@ -4800,7 +4802,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:4804: checking for $ac_word" >&5 +echo "configure:4806: 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 @@ -4835,7 +4837,7 @@ fi else echo $ac_n "checking for gunzip""... $ac_c" 1>&6 -echo "configure:4839: checking for gunzip" >&5 +echo "configure:4841: checking for gunzip" >&5 echo "$ac_t""$UNCOMPRESS" 1>&6 eval 'ac_cv_path_'UNCOMPRESS'="'gunzip'"' fi @@ -4877,7 +4879,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:4881: checking for $ac_word" >&5 +echo "configure:4883: 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 @@ -4912,7 +4914,7 @@ fi else echo $ac_n "checking for unzip""... $ac_c" 1>&6 -echo "configure:4916: checking for unzip" >&5 +echo "configure:4918: checking for unzip" >&5 echo "$ac_t""$UNZIP" 1>&6 eval 'ac_cv_path_'UNZIP'="'unzip'"' fi @@ -4954,7 +4956,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "bzip2", so it can be a program name with args. set dummy bzip2; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4958: checking for $ac_word" >&5 +echo "configure:4960: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_BZIP2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4989,7 +4991,7 @@ fi else echo $ac_n "checking for bzip2""... $ac_c" 1>&6 -echo "configure:4993: checking for bzip2" >&5 +echo "configure:4995: checking for bzip2" >&5 echo "$ac_t""$BZIP2" 1>&6 eval 'ac_cv_path_'BZIP2'="'bzip2'"' fi @@ -5031,7 +5033,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:5035: checking for $ac_word" >&5 +echo "configure:5037: 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 @@ -5066,7 +5068,7 @@ fi else echo $ac_n "checking for uudecode""... $ac_c" 1>&6 -echo "configure:5070: checking for uudecode" >&5 +echo "configure:5072: checking for uudecode" >&5 echo "$ac_t""$UUDECODE" 1>&6 eval 'ac_cv_path_'UUDECODE'="'uudecode'"' fi @@ -5108,7 +5110,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:5112: checking for $ac_word" >&5 +echo "configure:5114: 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 @@ -5143,7 +5145,7 @@ fi else echo $ac_n "checking for zcat""... $ac_c" 1>&6 -echo "configure:5147: checking for zcat" >&5 +echo "configure:5149: checking for zcat" >&5 echo "$ac_t""$ZCAT" 1>&6 eval 'ac_cv_path_'ZCAT'="'zcat'"' fi @@ -5185,7 +5187,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:5189: checking for $ac_word" >&5 +echo "configure:5191: 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 @@ -5220,7 +5222,7 @@ fi else echo $ac_n "checking for zip""... $ac_c" 1>&6 -echo "configure:5224: checking for zip" >&5 +echo "configure:5226: checking for zip" >&5 echo "$ac_t""$ZIP" 1>&6 eval 'ac_cv_path_'ZIP'="'zip'"' fi @@ -5262,7 +5264,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "telnet", so it can be a program name with args. set dummy telnet; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5266: checking for $ac_word" >&5 +echo "configure:5268: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TELNET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5297,7 +5299,7 @@ fi else echo $ac_n "checking for telnet""... $ac_c" 1>&6 -echo "configure:5301: checking for telnet" >&5 +echo "configure:5303: checking for telnet" >&5 echo "$ac_t""$TELNET" 1>&6 eval 'ac_cv_path_'TELNET'="'telnet'"' fi @@ -5339,7 +5341,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "tn3270", so it can be a program name with args. set dummy tn3270; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5343: checking for $ac_word" >&5 +echo "configure:5345: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TN3270'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5374,7 +5376,7 @@ fi else echo $ac_n "checking for tn3270""... $ac_c" 1>&6 -echo "configure:5378: checking for tn3270" >&5 +echo "configure:5380: checking for tn3270" >&5 echo "$ac_t""$TN3270" 1>&6 eval 'ac_cv_path_'TN3270'="'tn3270'"' fi @@ -5416,7 +5418,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "rlogin", so it can be a program name with args. set dummy rlogin; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5420: checking for $ac_word" >&5 +echo "configure:5422: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_RLOGIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5451,7 +5453,7 @@ fi else echo $ac_n "checking for rlogin""... $ac_c" 1>&6 -echo "configure:5455: checking for rlogin" >&5 +echo "configure:5457: checking for rlogin" >&5 echo "$ac_t""$RLOGIN" 1>&6 eval 'ac_cv_path_'RLOGIN'="'rlogin'"' fi @@ -5503,7 +5505,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "install", so it can be a program name with args. set dummy install; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5507: checking for $ac_word" >&5 +echo "configure:5509: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_INSTALL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5538,7 +5540,7 @@ fi else echo $ac_n "checking for install""... $ac_c" 1>&6 -echo "configure:5542: checking for install" >&5 +echo "configure:5544: checking for install" >&5 echo "$ac_t""$INSTALL" 1>&6 eval 'ac_cv_path_'INSTALL'="'install'"' fi @@ -5580,13 +5582,13 @@ esac echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6 -echo "configure:5584: checking if we must define _GNU_SOURCE" >&5 +echo "configure:5586: checking if we must define _GNU_SOURCE" >&5 if eval "test \"`echo '$''{'cf_cv_gnu_source'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5590 "configure" +#line 5592 "configure" #include "confdefs.h" #include <sys/types.h> int main() { @@ -5596,7 +5598,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:5600: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_gnu_source=no else @@ -5606,7 +5608,7 @@ else cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat > conftest.$ac_ext <<EOF -#line 5610 "configure" +#line 5612 "configure" #include "confdefs.h" #include <sys/types.h> int main() { @@ -5616,7 +5618,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:5620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5622: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_gnu_source=no else @@ -5660,16 +5662,16 @@ do done echo $ac_n "checking if we should use compile options $TRY_CFLAGS""... $ac_c" 1>&6 -echo "configure:5664: checking if we should use compile options $TRY_CFLAGS" >&5 +echo "configure:5666: checking if we should use compile options $TRY_CFLAGS" >&5 cat > conftest.$ac_ext <<EOF -#line 5666 "configure" +#line 5668 "configure" #include "confdefs.h" #include <stdio.h> int main() { FILE *fp = stdin ; return 0; } EOF -if { (eval echo configure:5673: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5675: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_result=yes else @@ -5690,7 +5692,7 @@ fi ### Look for network libraries first, since some functions (such as gethostname) ### are used in a lot of places. echo $ac_n "checking if you want ssl library""... $ac_c" 1>&6 -echo "configure:5694: checking if you want ssl library" >&5 +echo "configure:5696: checking if you want ssl library" >&5 if eval "test \"`echo '$''{'cf_cv_use_libssl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5710,7 +5712,7 @@ fi echo "$ac_t""$cf_cv_use_libssl" 1>&6 echo $ac_n "checking if you want socks library""... $ac_c" 1>&6 -echo "configure:5714: checking if you want socks library" >&5 +echo "configure:5716: 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 @@ -5730,7 +5732,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:5734: checking if you want socks5 library" >&5 +echo "configure:5736: 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 @@ -5806,7 +5808,7 @@ cat >> confdefs.h <<\EOF EOF cat > conftest.$ac_ext <<EOF -#line 5810 "configure" +#line 5812 "configure" #include "confdefs.h" #include <stdio.h> @@ -5815,7 +5817,7 @@ int main() { accept((char *)0) ; return 0; } EOF -if { (eval echo configure:5819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -5854,10 +5856,10 @@ cat >> confdefs.h <<\EOF EOF echo $ac_n "checking if the socks library uses socks4 prefix""... $ac_c" 1>&6 -echo "configure:5858: checking if the socks library uses socks4 prefix" >&5 +echo "configure:5860: checking if the socks library uses socks4 prefix" >&5 cf_use_socks4=error cat > conftest.$ac_ext <<EOF -#line 5861 "configure" +#line 5863 "configure" #include "confdefs.h" #include <socks.h> @@ -5866,7 +5868,7 @@ int main() { Rinit((char *)0) ; return 0; } EOF -if { (eval echo configure:5870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define USE_SOCKS4_PREFIX 1 @@ -5878,14 +5880,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 5882 "configure" +#line 5884 "configure" #include "confdefs.h" #include <socks.h> int main() { SOCKSinit((char *)0) ; return 0; } EOF -if { (eval echo configure:5889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_use_socks4=no else @@ -5950,9 +5952,9 @@ EOF fi echo $ac_n "checking if socks5p.h is available""... $ac_c" 1>&6 -echo "configure:5954: checking if socks5p.h is available" >&5 +echo "configure:5956: checking if socks5p.h is available" >&5 cat > conftest.$ac_ext <<EOF -#line 5956 "configure" +#line 5958 "configure" #include "confdefs.h" #define INCLUDE_PROTOTYPES @@ -5962,7 +5964,7 @@ int main() { init((char *)0) ; return 0; } EOF -if { (eval echo configure:5966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_use_socks5p_h=yes else @@ -5982,7 +5984,7 @@ else cf_test_netlibs=no echo $ac_n "checking for network libraries""... $ac_c" 1>&6 -echo "configure:5986: checking for network libraries" >&5 +echo "configure:5988: checking for network libraries" >&5 if eval "test \"`echo '$''{'cf_cv_netlibs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5993,12 +5995,12 @@ cf_test_netlibs=yes for ac_func in gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5997: checking for $ac_func" >&5 +echo "configure:5999: 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 6002 "configure" +#line 6004 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6021,7 +6023,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6044,7 +6046,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:6048: checking for gethostname in -lnsl" >&5 +echo "configure:6050: 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 @@ -6052,7 +6054,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 6056 "configure" +#line 6058 "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 @@ -6063,7 +6065,7 @@ int main() { gethostname() ; return 0; } EOF -if { (eval echo configure:6067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6096,7 +6098,7 @@ else echo $ac_n "checking for gethostname in -lsocket""... $ac_c" 1>&6 -echo "configure:6100: checking for gethostname in -lsocket" >&5 +echo "configure:6102: 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 @@ -6104,7 +6106,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 6108 "configure" +#line 6110 "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 @@ -6115,7 +6117,7 @@ int main() { gethostname() ; return 0; } EOF -if { (eval echo configure:6119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6160,7 +6162,7 @@ done # I don't know the entrypoints - 97/7/22 TD # AC_HAVE_LIBRARY(inet,cf_cv_netlibs="-linet $cf_cv_netlibs") echo $ac_n "checking for main in -linet""... $ac_c" 1>&6 -echo "configure:6164: checking for main in -linet" >&5 +echo "configure:6166: checking for main in -linet" >&5 ac_lib_var=`echo inet'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6168,14 +6170,14 @@ else ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <<EOF -#line 6172 "configure" +#line 6174 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6200,12 +6202,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:6204: checking for $ac_func" >&5 +echo "configure:6206: 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 6209 "configure" +#line 6211 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6228,7 +6230,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6251,7 +6253,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:6255: checking for socket in -lsocket" >&5 +echo "configure:6257: 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 @@ -6259,7 +6261,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 6263 "configure" +#line 6265 "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 @@ -6270,7 +6272,7 @@ int main() { socket() ; return 0; } EOF -if { (eval echo configure:6274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6303,7 +6305,7 @@ else echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6 -echo "configure:6307: checking for socket in -lbsd" >&5 +echo "configure:6309: 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 @@ -6311,7 +6313,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 6315 "configure" +#line 6317 "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 @@ -6322,7 +6324,7 @@ int main() { socket() ; return 0; } EOF -if { (eval echo configure:6326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6367,12 +6369,12 @@ fi for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6371: checking for $ac_func" >&5 +echo "configure:6373: 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 6376 "configure" +#line 6378 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6395,7 +6397,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6418,7 +6420,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:6422: checking for gethostbyname in -lnsl" >&5 +echo "configure:6424: 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 @@ -6426,7 +6428,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 6430 "configure" +#line 6432 "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 @@ -6437,7 +6439,7 @@ int main() { gethostbyname() ; return 0; } EOF -if { (eval echo configure:6441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6478,12 +6480,12 @@ done for ac_func in strcasecmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6482: checking for $ac_func" >&5 +echo "configure:6484: 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 6487 "configure" +#line 6489 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6506,7 +6508,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6529,7 +6531,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6 -echo "configure:6533: checking for strcasecmp in -lresolv" >&5 +echo "configure:6535: 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 @@ -6537,7 +6539,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 6541 "configure" +#line 6543 "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 @@ -6548,7 +6550,7 @@ int main() { strcasecmp() ; return 0; } EOF -if { (eval echo configure:6552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6594,13 +6596,13 @@ test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&6 fi echo $ac_n "checking for inet_aton function""... $ac_c" 1>&6 -echo "configure:6598: checking for inet_aton function" >&5 +echo "configure:6600: checking for inet_aton function" >&5 if eval "test \"`echo '$''{'cf_cv_have_inet_aton'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6604 "configure" +#line 6606 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -6611,7 +6613,7 @@ int main() { inet_aton(0, (struct in_addr *)0) ; return 0; } EOF -if { (eval echo configure:6615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_have_inet_aton=yes else @@ -6631,13 +6633,13 @@ EOF else echo $ac_n "checking for inet_addr function""... $ac_c" 1>&6 -echo "configure:6635: checking for inet_addr function" >&5 +echo "configure:6637: checking for inet_addr function" >&5 if eval "test \"`echo '$''{'cf_cv_have_inet_addr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6641 "configure" +#line 6643 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -6648,7 +6650,7 @@ int main() { inet_addr(0) ; return 0; } EOF -if { (eval echo configure:6652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_have_inet_addr=yes else @@ -6663,7 +6665,7 @@ fi echo "$ac_t""$cf_cv_have_inet_addr" 1>&6 if test "$cf_cv_have_inet_addr" = no ; then echo $ac_n "checking for library with inet_addr""... $ac_c" 1>&6 -echo "configure:6667: checking for library with inet_addr" >&5 +echo "configure:6669: checking for library with inet_addr" >&5 if eval "test \"`echo '$''{'cf_cv_lib_inet_addr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6673,7 +6675,7 @@ else do LIBS="$cf_save_LIBS $cf_inetlib" cat > conftest.$ac_ext <<EOF -#line 6677 "configure" +#line 6679 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -6684,7 +6686,7 @@ int main() { inet_addr(0) ; return 0; } EOF -if { (eval echo configure:6688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_lib_inet_addr=$cf_inetlib else @@ -6717,7 +6719,7 @@ no) #(vi ;; yes) #(vi echo $ac_n "checking for SSL_get_version in -lssl""... $ac_c" 1>&6 -echo "configure:6721: checking for SSL_get_version in -lssl" >&5 +echo "configure:6723: checking for SSL_get_version in -lssl" >&5 ac_lib_var=`echo ssl'_'SSL_get_version | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6725,7 +6727,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lssl -lcrypto $LIBS" cat > conftest.$ac_ext <<EOF -#line 6729 "configure" +#line 6731 "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 @@ -6736,7 +6738,7 @@ int main() { SSL_get_version() ; return 0; } EOF -if { (eval echo configure:6740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6791,9 +6793,9 @@ esac LIBS="$cf_ssl_library $LIBS" echo $ac_n "checking for openssl include directory""... $ac_c" 1>&6 -echo "configure:6795: checking for openssl include directory" >&5 +echo "configure:6797: checking for openssl include directory" >&5 cat > conftest.$ac_ext <<EOF -#line 6797 "configure" +#line 6799 "configure" #include "confdefs.h" #include <stdio.h> @@ -6802,7 +6804,7 @@ int main() { SSL_shutdown((SSL *)0) ; return 0; } EOF -if { (eval echo configure:6806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6808: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_openssl_incl=yes else @@ -6819,9 +6821,9 @@ EOF echo $ac_n "checking if we can link to ssl library""... $ac_c" 1>&6 -echo "configure:6823: checking if we can link to ssl library" >&5 +echo "configure:6825: checking if we can link to ssl library" >&5 cat > conftest.$ac_ext <<EOF -#line 6825 "configure" +#line 6827 "configure" #include "confdefs.h" #include <stdio.h> @@ -6835,7 +6837,7 @@ int main() { SSL_shutdown((SSL *)0) ; return 0; } EOF -if { (eval echo configure:6839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_ssl_library=yes else @@ -6858,7 +6860,7 @@ fi fi echo $ac_n "checking for screen type""... $ac_c" 1>&6 -echo "configure:6862: checking for screen type" >&5 +echo "configure:6864: checking for screen type" >&5 if eval "test \"`echo '$''{'cf_cv_screen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6901,7 +6903,7 @@ curses) echo $ac_n "checking for extra include directories""... $ac_c" 1>&6 -echo "configure:6905: checking for extra include directories" >&5 +echo "configure:6907: checking for extra include directories" >&5 if eval "test \"`echo '$''{'cf_cv_curses_incdir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6925,7 +6927,7 @@ echo "$ac_t""$cf_cv_curses_incdir" 1>&6 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir" echo $ac_n "checking if we have identified curses headers""... $ac_c" 1>&6 -echo "configure:6929: checking if we have identified curses headers" >&5 +echo "configure:6931: checking if we have identified curses headers" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6938,14 +6940,14 @@ for cf_header in \ ncurses/ncurses.h do cat > conftest.$ac_ext <<EOF -#line 6942 "configure" +#line 6944 "configure" #include "confdefs.h" #include <${cf_header}> int main() { initscr(); tgoto("?", 0,0) ; return 0; } EOF -if { (eval echo configure:6949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_header=$cf_header; break else @@ -6964,17 +6966,17 @@ for ac_hdr in $cf_cv_ncurses_header do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6968: checking for $ac_hdr" >&5 +echo "configure:6970: 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 6973 "configure" +#line 6975 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6978: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6980: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7004,7 +7006,7 @@ done echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:7008: checking for ncurses version" >&5 +echo "configure:7010: 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 @@ -7030,7 +7032,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:7034: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:7036: \"$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" @@ -7039,7 +7041,7 @@ EOF else cat > conftest.$ac_ext <<EOF -#line 7043 "configure" +#line 7045 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -7063,7 +7065,7 @@ int main() exit(0); } EOF -if { (eval echo configure:7067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -7087,16 +7089,16 @@ EOF echo $ac_n "checking if we have identified curses libraries""... $ac_c" 1>&6 -echo "configure:7091: checking if we have identified curses libraries" >&5 +echo "configure:7093: checking if we have identified curses libraries" >&5 cat > conftest.$ac_ext <<EOF -#line 7093 "configure" +#line 7095 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr(); tgoto("?", 0,0) ; return 0; } EOF -if { (eval echo configure:7100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -7112,7 +7114,7 @@ if test "$cf_result" = no ; then case $host_os in #(vi freebsd*) #(vi echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:7116: checking for tgoto in -lmytinfo" >&5 +echo "configure:7118: 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 @@ -7120,7 +7122,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <<EOF -#line 7124 "configure" +#line 7126 "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 @@ -7131,7 +7133,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:7135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7154,7 +7156,7 @@ fi ;; hpux10.*|hpux11.*) #(vi echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6 -echo "configure:7158: checking for initscr in -lcur_colr" >&5 +echo "configure:7160: 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 @@ -7162,7 +7164,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcur_colr $LIBS" cat > conftest.$ac_ext <<EOF -#line 7166 "configure" +#line 7168 "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 @@ -7173,7 +7175,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:7177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7196,7 +7198,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6 -echo "configure:7200: checking for initscr in -lHcurses" >&5 +echo "configure:7202: 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 @@ -7204,7 +7206,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lHcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 7208 "configure" +#line 7210 "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 @@ -7215,7 +7217,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:7219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7268,12 +7270,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:7272: checking for tgoto" >&5 +echo "configure:7274: 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 7277 "configure" +#line 7279 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char tgoto(); below. */ @@ -7296,7 +7298,7 @@ tgoto(); ; return 0; } EOF -if { (eval echo configure:7300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_tgoto=yes" else @@ -7317,7 +7319,7 @@ else for cf_term_lib in $cf_check_list termcap termlib unknown do echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6 -echo "configure:7321: checking for tgoto in -l$cf_term_lib" >&5 +echo "configure:7323: 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 @@ -7325,7 +7327,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_term_lib $LIBS" cat > conftest.$ac_ext <<EOF -#line 7329 "configure" +#line 7331 "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 @@ -7336,7 +7338,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:7340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7366,7 +7368,7 @@ fi for cf_curs_lib in $cf_check_list xcurses jcurses unknown do echo $ac_n "checking for initscr in -l$cf_curs_lib""... $ac_c" 1>&6 -echo "configure:7370: checking for initscr in -l$cf_curs_lib" >&5 +echo "configure:7372: 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 @@ -7374,7 +7376,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_curs_lib $LIBS" cat > conftest.$ac_ext <<EOF -#line 7378 "configure" +#line 7380 "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 @@ -7385,7 +7387,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:7389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7411,16 +7413,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:7415: checking if we can link with $cf_curs_lib library" >&5 +echo "configure:7417: checking if we can link with $cf_curs_lib library" >&5 cat > conftest.$ac_ext <<EOF -#line 7417 "configure" +#line 7419 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:7424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -7436,16 +7438,16 @@ rm -f conftest* : elif test "$cf_term_lib" != predefined ; then echo $ac_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries""... $ac_c" 1>&6 -echo "configure:7440: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 +echo "configure:7442: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 cat > conftest.$ac_ext <<EOF -#line 7442 "configure" +#line 7444 "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:7449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=no else @@ -7455,14 +7457,14 @@ else LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 7459 "configure" +#line 7461 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:7466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -7483,14 +7485,14 @@ fi echo $ac_n "checking for curses performance tradeoff""... $ac_c" 1>&6 -echo "configure:7487: checking for curses performance tradeoff" >&5 +echo "configure:7489: 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 7494 "configure" +#line 7496 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -7504,11 +7506,11 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 7512 "configure" +#line 7514 "configure" #include "confdefs.h" #define CURS_PERFORMANCE @@ -7523,7 +7525,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_curs_performance=yes else @@ -7546,13 +7548,13 @@ EOF echo $ac_n "checking for curses touchline function""... $ac_c" 1>&6 -echo "configure:7550: checking for curses touchline function" >&5 +echo "configure:7552: checking for curses touchline function" >&5 if eval "test \"`echo '$''{'cf_cv_curs_touchline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7556 "configure" +#line 7558 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -7560,7 +7562,7 @@ int main() { touchline(stdscr, 1,2,3); ; return 0; } EOF -if { (eval echo configure:7564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_curs_touchline=bsd else @@ -7568,7 +7570,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 7572 "configure" +#line 7574 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -7576,7 +7578,7 @@ int main() { touchline(stdscr, 1,2); ; return 0; } EOF -if { (eval echo configure:7580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_curs_touchline=sysv else @@ -7610,7 +7612,7 @@ esac ncurses) echo $ac_n "checking for ncurses header in include-path""... $ac_c" 1>&6 -echo "configure:7614: checking for ncurses header in include-path" >&5 +echo "configure:7616: checking for ncurses header in include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7622,7 +7624,7 @@ else ncurses/ncurses.h do cat > conftest.$ac_ext <<EOF -#line 7626 "configure" +#line 7628 "configure" #include "confdefs.h" #include <$cf_header> int main() { @@ -7640,7 +7642,7 @@ make an error ; return 0; } EOF -if { (eval echo configure:7644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h=$cf_header; break @@ -7661,7 +7663,7 @@ if test "$cf_cv_ncurses_h" != no ; then cf_cv_ncurses_header=$cf_cv_ncurses_h else echo $ac_n "checking for ncurses include-path""... $ac_c" 1>&6 -echo "configure:7665: checking for ncurses include-path" >&5 +echo "configure:7667: checking for ncurses include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7788,7 +7790,7 @@ esac echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:7792: checking for ncurses version" >&5 +echo "configure:7794: 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 @@ -7814,7 +7816,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:7818: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:7820: \"$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" @@ -7823,7 +7825,7 @@ EOF else cat > conftest.$ac_ext <<EOF -#line 7827 "configure" +#line 7829 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -7847,7 +7849,7 @@ int main() exit(0); } EOF -if { (eval echo configure:7851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -7877,7 +7879,7 @@ EOF cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:7881: checking for Gpm_Open in -lgpm" >&5 +echo "configure:7883: 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 @@ -7885,7 +7887,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <<EOF -#line 7889 "configure" +#line 7891 "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 @@ -7896,7 +7898,7 @@ int main() { Gpm_Open() ; return 0; } EOF -if { (eval echo configure:7900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7912,7 +7914,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:7916: checking for initscr in -lgpm" >&5 +echo "configure:7918: 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 @@ -7920,7 +7922,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <<EOF -#line 7924 "configure" +#line 7926 "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 @@ -7931,7 +7933,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:7935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7962,7 +7964,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:7966: checking for tgoto in -lmytinfo" >&5 +echo "configure:7968: 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 @@ -7970,7 +7972,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <<EOF -#line 7974 "configure" +#line 7976 "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 @@ -7981,7 +7983,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:7985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8009,12 +8011,12 @@ LIBS="$cf_ncurses_LIBS $LIBS" eval 'cf_cv_have_lib_'ncurses'=no' cf_libdir="" echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:8013: checking for initscr" >&5 +echo "configure:8015: 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 8018 "configure" +#line 8020 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr(); below. */ @@ -8037,7 +8039,7 @@ initscr(); ; return 0; } EOF -if { (eval echo configure:8041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_initscr=yes" else @@ -8057,17 +8059,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 -echo "configure:8061: checking for initscr in -lncurses" >&5 +echo "configure:8063: checking for initscr in -lncurses" >&5 LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 8064 "configure" +#line 8066 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:8071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'ncurses'=yes' @@ -8111,17 +8113,17 @@ cf_search="$cf_search $HOME/lib $HOME/lib/ncurses $HOME/ncurses/lib" for cf_libdir in $cf_search do echo $ac_n "checking for -lncurses in $cf_libdir""... $ac_c" 1>&6 -echo "configure:8115: checking for -lncurses in $cf_libdir" >&5 +echo "configure:8117: checking for -lncurses in $cf_libdir" >&5 LIBS="-L$cf_libdir -lncurses $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 8118 "configure" +#line 8120 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:8125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'ncurses'=yes' @@ -8151,7 +8153,7 @@ fi 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:8155: checking if we can link ncurses without $cf_ncurses_LIBS" >&5 +echo "configure:8157: 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'$//'` @@ -8160,14 +8162,14 @@ echo "configure:8155: checking if we can link ncurses without $cf_ncurses_LIBS" fi done cat > conftest.$ac_ext <<EOF -#line 8164 "configure" +#line 8166 "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:8171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -8182,7 +8184,7 @@ fi echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:8186: checking for ncurses version" >&5 +echo "configure:8188: 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 @@ -8208,7 +8210,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:8212: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:8214: \"$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" @@ -8217,7 +8219,7 @@ EOF else cat > conftest.$ac_ext <<EOF -#line 8221 "configure" +#line 8223 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -8241,7 +8243,7 @@ int main() exit(0); } EOF -if { (eval echo configure:8245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -8269,20 +8271,20 @@ pdcurses) slang) echo $ac_n "checking for slang header file""... $ac_c" 1>&6 -echo "configure:8273: checking for slang header file" >&5 +echo "configure:8275: 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 8279 "configure" +#line 8281 "configure" #include "confdefs.h" #include <slang.h> int main() { printf("%s\n", SLANG_VERSION) ; return 0; } EOF -if { (eval echo configure:8286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_slang_header=predefined else @@ -8378,24 +8380,24 @@ else cf_cv_termlib=none cat > conftest.$ac_ext <<EOF -#line 8382 "configure" +#line 8384 "configure" #include "confdefs.h" int main() { char *x=(char*)tgoto("",0,0) ; return 0; } EOF -if { (eval echo configure:8389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 8392 "configure" +#line 8394 "configure" #include "confdefs.h" int main() { int x=tigetstr("") ; return 0; } EOF -if { (eval echo configure:8399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_termlib=terminfo else @@ -8424,16 +8426,16 @@ if test "$cf_cv_termlib" = none; then for cf_func in tigetstr tgetstr do echo $ac_n "checking for $cf_func in -l$cf_lib""... $ac_c" 1>&6 -echo "configure:8428: checking for $cf_func in -l$cf_lib" >&5 +echo "configure:8430: checking for $cf_func in -l$cf_lib" >&5 cat > conftest.$ac_ext <<EOF -#line 8430 "configure" +#line 8432 "configure" #include "confdefs.h" int main() { int x=$cf_func("") ; return 0; } EOF -if { (eval echo configure:8437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -8460,7 +8462,7 @@ fi if test "$cf_cv_termlib" = none; then # allow curses library for broken AIX system. echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6 -echo "configure:8464: checking for initscr in -lcurses" >&5 +echo "configure:8466: 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 @@ -8468,7 +8470,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 8472 "configure" +#line 8474 "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 @@ -8479,7 +8481,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:8483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8500,7 +8502,7 @@ else fi echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:8504: checking for tgoto in -ltermcap" >&5 +echo "configure:8506: 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 @@ -8508,7 +8510,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <<EOF -#line 8512 "configure" +#line 8514 "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 @@ -8519,7 +8521,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:8523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8551,12 +8553,12 @@ fi cf_slang_LIBS2="$LIBS" echo $ac_n "checking for acos""... $ac_c" 1>&6 -echo "configure:8555: checking for acos" >&5 +echo "configure:8557: 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 8560 "configure" +#line 8562 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char acos(); below. */ @@ -8579,7 +8581,7 @@ acos(); ; return 0; } EOF -if { (eval echo configure:8583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_acos=yes" else @@ -8598,7 +8600,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for acos in -lm""... $ac_c" 1>&6 -echo "configure:8602: checking for acos in -lm" >&5 +echo "configure:8604: 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 @@ -8606,7 +8608,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 8610 "configure" +#line 8612 "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 @@ -8617,7 +8619,7 @@ int main() { acos() ; return 0; } EOF -if { (eval echo configure:8621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8659,12 +8661,12 @@ os2*) eval 'cf_cv_have_lib_'video'=no' cf_libdir="" echo $ac_n "checking for v_init""... $ac_c" 1>&6 -echo "configure:8663: checking for v_init" >&5 +echo "configure:8665: checking for v_init" >&5 if eval "test \"`echo '$''{'ac_cv_func_v_init'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8668 "configure" +#line 8670 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char v_init(); below. */ @@ -8687,7 +8689,7 @@ v_init(); ; return 0; } EOF -if { (eval echo configure:8691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_v_init=yes" else @@ -8707,17 +8709,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for v_init in -lvideo""... $ac_c" 1>&6 -echo "configure:8711: checking for v_init in -lvideo" >&5 +echo "configure:8713: checking for v_init in -lvideo" >&5 LIBS="-lvideo $LIBS" cat > conftest.$ac_ext <<EOF -#line 8714 "configure" +#line 8716 "configure" #include "confdefs.h" #include <sys/video.h> int main() { v_init() ; return 0; } EOF -if { (eval echo configure:8721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'video'=yes' @@ -8761,17 +8763,17 @@ cf_search="$cf_search $HOME/lib $HOME/lib/video $HOME/video/lib" for cf_libdir in $cf_search do echo $ac_n "checking for -lvideo in $cf_libdir""... $ac_c" 1>&6 -echo "configure:8765: checking for -lvideo in $cf_libdir" >&5 +echo "configure:8767: checking for -lvideo in $cf_libdir" >&5 LIBS="-L$cf_libdir -lvideo $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 8768 "configure" +#line 8770 "configure" #include "confdefs.h" #include <sys/video.h> int main() { v_init() ; return 0; } EOF -if { (eval echo configure:8775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'video'=yes' @@ -8804,12 +8806,12 @@ esac eval 'cf_cv_have_lib_'slang'=no' cf_libdir="" echo $ac_n "checking for SLtt_get_screen_size""... $ac_c" 1>&6 -echo "configure:8808: checking for SLtt_get_screen_size" >&5 +echo "configure:8810: 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 8813 "configure" +#line 8815 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char SLtt_get_screen_size(); below. */ @@ -8832,7 +8834,7 @@ SLtt_get_screen_size(); ; return 0; } EOF -if { (eval echo configure:8836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_SLtt_get_screen_size=yes" else @@ -8852,17 +8854,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for SLtt_get_screen_size in -lslang""... $ac_c" 1>&6 -echo "configure:8856: checking for SLtt_get_screen_size in -lslang" >&5 +echo "configure:8858: checking for SLtt_get_screen_size in -lslang" >&5 LIBS="-lslang $LIBS" cat > conftest.$ac_ext <<EOF -#line 8859 "configure" +#line 8861 "configure" #include "confdefs.h" #include <slang.h> int main() { SLtt_get_screen_size() ; return 0; } EOF -if { (eval echo configure:8866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'slang'=yes' @@ -8906,17 +8908,17 @@ cf_search="$cf_search $HOME/lib $HOME/lib/slang $HOME/slang/lib" for cf_libdir in $cf_search do echo $ac_n "checking for -lslang in $cf_libdir""... $ac_c" 1>&6 -echo "configure:8910: checking for -lslang in $cf_libdir" >&5 +echo "configure:8912: checking for -lslang in $cf_libdir" >&5 LIBS="-L$cf_libdir -lslang $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 8913 "configure" +#line 8915 "configure" #include "confdefs.h" #include <slang.h> int main() { SLtt_get_screen_size() ; return 0; } EOF -if { (eval echo configure:8920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'slang'=yes' @@ -8945,7 +8947,7 @@ fi cf_slang_LIBS3="$LIBS" echo $ac_n "checking if we can link slang without termcap""... $ac_c" 1>&6 -echo "configure:8949: checking if we can link slang without termcap" >&5 +echo "configure:8951: 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 @@ -8953,14 +8955,14 @@ else fi LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s@$cf_exclude@@" -e 's@^.@@'` cat > conftest.$ac_ext <<EOF -#line 8957 "configure" +#line 8959 "configure" #include "confdefs.h" #include <slang.h> int main() { SLtt_get_screen_size() ; return 0; } EOF -if { (eval echo configure:8964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -8977,13 +8979,13 @@ test $cf_result = no && LIBS="$cf_slang_LIBS3" echo $ac_n "checking if we must tell slang this is UNIX""... $ac_c" 1>&6 -echo "configure:8981: checking if we must tell slang this is UNIX" >&5 +echo "configure:8983: checking if we must tell slang this is UNIX" >&5 if eval "test \"`echo '$''{'cf_cv_slang_unix'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8987 "configure" +#line 8989 "configure" #include "confdefs.h" #include <slang.h> int main() { @@ -8997,7 +8999,7 @@ SLang_TT_Baud_Rate = 1 ; return 0; } EOF -if { (eval echo configure:9001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_slang_unix=yes else @@ -9023,7 +9025,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:9027: checking for location of config-file" >&5 +echo "configure:9029: 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" @@ -9035,7 +9037,7 @@ CHARSET_DEFS= echo $ac_n "checking if you want only a few charsets""... $ac_c" 1>&6 -echo "configure:9039: checking if you want only a few charsets" >&5 +echo "configure:9041: checking if you want only a few charsets" >&5 # Check whether --with-charsets or --without-charsets was given. if test "${with_charsets+set}" = set; then @@ -9096,12 +9098,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:9100: checking for ANSI C header files" >&5 +echo "configure:9102: 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 9105 "configure" +#line 9107 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -9109,7 +9111,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9126,7 +9128,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 9130 "configure" +#line 9132 "configure" #include "confdefs.h" #include <string.h> EOF @@ -9144,7 +9146,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 9148 "configure" +#line 9150 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -9165,7 +9167,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 9169 "configure" +#line 9171 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -9176,7 +9178,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:9180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -9200,12 +9202,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:9204: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:9206: 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 9209 "configure" +#line 9211 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -9214,7 +9216,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:9218: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9220: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -9239,12 +9241,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:9243: checking for $ac_hdr that defines DIR" >&5 +echo "configure:9245: 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 9248 "configure" +#line 9250 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -9252,7 +9254,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:9256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -9277,7 +9279,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:9281: checking for opendir in -ldir" >&5 +echo "configure:9283: 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 @@ -9285,7 +9287,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <<EOF -#line 9289 "configure" +#line 9291 "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 @@ -9296,7 +9298,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:9300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9318,7 +9320,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:9322: checking for opendir in -lx" >&5 +echo "configure:9324: 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 @@ -9326,7 +9328,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <<EOF -#line 9330 "configure" +#line 9332 "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 @@ -9337,7 +9339,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:9341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9380,17 +9382,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:9384: checking for $ac_hdr" >&5 +echo "configure:9386: 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 9389 "configure" +#line 9391 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9394: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9418,13 +9420,13 @@ done echo $ac_n "checking termio.h and termios.h""... $ac_c" 1>&6 -echo "configure:9422: checking termio.h and termios.h" >&5 +echo "configure:9424: 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 9428 "configure" +#line 9430 "configure" #include "confdefs.h" #if HAVE_TERMIO_H @@ -9437,7 +9439,7 @@ int main() { putchar (0x0a) ; return 0; } EOF -if { (eval echo configure:9441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9443: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_termio_and_termios=yes else @@ -9457,13 +9459,13 @@ EOF echo $ac_n "checking for sigaction and structs""... $ac_c" 1>&6 -echo "configure:9461: checking for sigaction and structs" >&5 +echo "configure:9463: checking for sigaction and structs" >&5 if eval "test \"`echo '$''{'cf_cv_func_sigaction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9467 "configure" +#line 9469 "configure" #include "confdefs.h" #include <sys/types.h> @@ -9478,7 +9480,7 @@ struct sigaction act; ; return 0; } EOF -if { (eval echo configure:9482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_func_sigaction=yes else @@ -9502,17 +9504,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:9506: checking for $ac_hdr" >&5 +echo "configure:9508: 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 9511 "configure" +#line 9513 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9516: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9518: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9549,17 +9551,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:9553: checking for $ac_hdr" >&5 +echo "configure:9555: 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 9558 "configure" +#line 9560 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9563: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9589,17 +9591,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:9593: checking for $ac_hdr" >&5 +echo "configure:9595: 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 9598 "configure" +#line 9600 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9603: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9640,13 +9642,13 @@ fi echo $ac_n "checking for union wait""... $ac_c" 1>&6 -echo "configure:9644: checking for union wait" >&5 +echo "configure:9646: 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 9650 "configure" +#line 9652 "configure" #include "confdefs.h" $cf_wait_headers int main() { @@ -9657,7 +9659,7 @@ int x; ; return 0; } EOF -if { (eval echo configure:9661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_type_unionwait=no echo compiles ok w/o union wait 1>&5 @@ -9668,7 +9670,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 9672 "configure" +#line 9674 "configure" #include "confdefs.h" $cf_wait_headers int main() { @@ -9683,7 +9685,7 @@ union wait x; ; return 0; } EOF -if { (eval echo configure:9687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_type_unionwait=yes echo compiles ok with union wait and possibly macros too 1>&5 @@ -9710,20 +9712,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:9714: checking if union wait can be used as wait-arg" >&5 +echo "configure:9716: 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 9720 "configure" +#line 9722 "configure" #include "confdefs.h" $cf_wait_headers int main() { union wait x; wait(&x) ; return 0; } EOF -if { (eval echo configure:9727: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_arg_union_wait=yes else @@ -9743,20 +9745,20 @@ EOF echo $ac_n "checking if union wait can be used as waitpid-arg""... $ac_c" 1>&6 -echo "configure:9747: checking if union wait can be used as waitpid-arg" >&5 +echo "configure:9749: 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 9753 "configure" +#line 9755 "configure" #include "confdefs.h" $cf_wait_headers int main() { union wait x; waitpid(0, &x, 0) ; return 0; } EOF -if { (eval echo configure:9760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9762: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_arg_union_waitpid=yes else @@ -9782,17 +9784,17 @@ for ac_hdr in stdarg.h varargs.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9786: checking for $ac_hdr" >&5 +echo "configure:9788: 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 9791 "configure" +#line 9793 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9796: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9798: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9819,13 +9821,13 @@ fi done echo $ac_n "checking for standard varargs""... $ac_c" 1>&6 -echo "configure:9823: checking for standard varargs" >&5 +echo "configure:9825: checking for standard varargs" >&5 if eval "test \"`echo '$''{'cf_cv_ansi_varargs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9829 "configure" +#line 9831 "configure" #include "confdefs.h" #if HAVE_STDARG_H @@ -9840,7 +9842,7 @@ int main() { return 0;} int foo(char *fmt,...){va_list args;va_start(args,fmt);va_end(args) ; return 0; } EOF -if { (eval echo configure:9844: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9846: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ansi_varargs=yes else @@ -9860,12 +9862,12 @@ EOF echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:9864: checking for uid_t in sys/types.h" >&5 +echo "configure:9866: 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 9869 "configure" +#line 9871 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -9894,7 +9896,7 @@ EOF fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 -echo "configure:9898: checking type of array argument to getgroups" >&5 +echo "configure:9900: 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 @@ -9902,7 +9904,7 @@ else ac_cv_type_getgroups=cross else cat > conftest.$ac_ext <<EOF -#line 9906 "configure" +#line 9908 "configure" #include "confdefs.h" /* Thanks to Mike Rendell for this test. */ @@ -9927,7 +9929,7 @@ main() } EOF -if { (eval echo configure:9931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_type_getgroups=gid_t else @@ -9941,7 +9943,7 @@ fi if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext <<EOF -#line 9945 "configure" +#line 9947 "configure" #include "confdefs.h" #include <unistd.h> EOF @@ -9965,12 +9967,12 @@ EOF echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:9969: checking for pid_t" >&5 +echo "configure:9971: 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 9974 "configure" +#line 9976 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -9998,12 +10000,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:10002: checking for uid_t in sys/types.h" >&5 +echo "configure:10004: 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 10007 "configure" +#line 10009 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -10032,12 +10034,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:10036: checking for mode_t" >&5 +echo "configure:10038: 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 10041 "configure" +#line 10043 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -10068,17 +10070,17 @@ fi ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:10072: checking for vfork.h" >&5 +echo "configure:10074: 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 10077 "configure" +#line 10079 "configure" #include "confdefs.h" #include <vfork.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10082: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10084: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10103,18 +10105,18 @@ else fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:10107: checking for working vfork" >&5 +echo "configure:10109: 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:10113: checking for vfork" >&5 +echo "configure:10115: 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 10118 "configure" +#line 10120 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vfork(); below. */ @@ -10137,7 +10139,7 @@ vfork(); ; return 0; } EOF -if { (eval echo configure:10141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vfork=yes" else @@ -10159,7 +10161,7 @@ fi ac_cv_func_vfork_works=$ac_cv_func_vfork else cat > conftest.$ac_ext <<EOF -#line 10163 "configure" +#line 10165 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include <stdio.h> @@ -10254,7 +10256,7 @@ main() { } } EOF -if { (eval echo configure:10258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_vfork_works=yes else @@ -10278,13 +10280,13 @@ fi echo $ac_n "checking if we should use fcntl or ioctl""... $ac_c" 1>&6 -echo "configure:10282: checking if we should use fcntl or ioctl" >&5 +echo "configure:10284: 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 10288 "configure" +#line 10290 "configure" #include "confdefs.h" #include <sys/types.h> @@ -10296,7 +10298,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_fionbio=ioctl else @@ -10305,7 +10307,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 10309 "configure" +#line 10311 "configure" #include "confdefs.h" #include <sys/types.h> @@ -10322,7 +10324,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_fionbio=fcntl else @@ -10345,20 +10347,20 @@ EOF echo $ac_n "checking for broken/missing definition of remove""... $ac_c" 1>&6 -echo "configure:10349: checking for broken/missing definition of remove" >&5 +echo "configure:10351: 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 10355 "configure" +#line 10357 "configure" #include "confdefs.h" #include <stdio.h> int main() { remove("dummy") ; return 0; } EOF -if { (eval echo configure:10362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_baddef_remove=no else @@ -10366,7 +10368,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 10370 "configure" +#line 10372 "configure" #include "confdefs.h" #include <stdio.h> int __unlink(name) { return unlink(name); } @@ -10374,7 +10376,7 @@ int main() { remove("dummy") ; return 0; } EOF -if { (eval echo configure:10378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_baddef_remove=yes else @@ -10398,13 +10400,13 @@ EOF echo $ac_n "checking for lstat""... $ac_c" 1>&6 -echo "configure:10402: checking for lstat" >&5 +echo "configure:10404: 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 10408 "configure" +#line 10410 "configure" #include "confdefs.h" #include <sys/types.h> @@ -10413,7 +10415,7 @@ int main() { lstat(".", (struct stat *)0) ; return 0; } EOF -if { (eval echo configure:10417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_lstat=yes else @@ -10441,7 +10443,6 @@ for ac_func in \ getgroups \ gettimeofday \ getuid \ - mkstemp \ mktemp \ popen \ putenv \ @@ -10456,12 +10457,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10460: checking for $ac_func" >&5 +echo "configure:10461: 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 10465 "configure" +#line 10466 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -10484,7 +10485,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:10488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10514,12 +10515,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10518: checking for $ac_func" >&5 +echo "configure:10519: 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 10523 "configure" +#line 10524 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -10542,7 +10543,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:10546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10570,8 +10571,123 @@ done +echo $ac_n "checking for working mkstemp""... $ac_c" 1>&6 +echo "configure:10576: checking for working mkstemp" >&5 +if eval "test \"`echo '$''{'cf_cv_func_mkstemp'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + +rm -f conftest* +if test "$cross_compiling" = yes; then + echo $ac_n "checking for mkstemp""... $ac_c" 1>&6 +echo "configure:10584: checking for mkstemp" >&5 +if eval "test \"`echo '$''{'ac_cv_func_mkstemp'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 10589 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char mkstemp(); below. */ +#include <assert.h> +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char mkstemp(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_mkstemp) || defined (__stub___mkstemp) +choke me +#else +mkstemp(); +#endif + +; return 0; } +EOF +if { (eval echo configure:10612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_mkstemp=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_mkstemp=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'mkstemp`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +fi + + +else + cat > conftest.$ac_ext <<EOF +#line 10634 "configure" +#include "confdefs.h" + +#include <sys/types.h> +#include <stdlib.h> +#include <stdio.h> +#include <sys/stat.h> +int main() +{ + char *tmpl = "conftestXXXXXX"; + char temp[80]; + int result = 0; + int fd; + struct stat sb; + + umask(077); + strcpy(temp, tmpl); + if ((fd = mkstemp(temp)) >= 0) { + if (!strcmp(temp, tmpl) + || stat(temp, &sb) != 0 + || (sb.st_mode & S_IFMT) != S_IFREG + || (sb.st_mode & 077) != 0) { + result = 1; + } + close(fd); + } + exit(result); +} + +EOF +if { (eval echo configure:10664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + cf_cv_func_mkstemp=yes + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + cf_cv_func_mkstemp=no + +fi +rm -fr conftest* +fi + + +fi + +echo "$ac_t""$cf_cv_func_mkstemp" 1>&6 +if test "$cf_cv_func_mkstemp" = yes ; then + cat >> confdefs.h <<\EOF +#define HAVE_MKSTEMP 1 +EOF + +fi + + echo $ac_n "checking for random-integer functions""... $ac_c" 1>&6 -echo "configure:10575: checking for random-integer functions" >&5 +echo "configure:10691: checking for random-integer functions" >&5 if eval "test \"`echo '$''{'cf_cv_srand_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10582,7 +10698,7 @@ do cf_srand_func=`echo $cf_func | sed -e 's@/.*@@'` cf_rand_func=`echo $cf_func | sed -e 's@.*/@@'` cat > conftest.$ac_ext <<EOF -#line 10586 "configure" +#line 10702 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -10596,7 +10712,7 @@ int main() { long seed = 1; $cf_srand_func(seed); seed = $cf_rand_func() ; return 0; } EOF -if { (eval echo configure:10600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_srand_func=$cf_func break @@ -10612,7 +10728,7 @@ fi echo "$ac_t""$cf_cv_srand_func" 1>&6 if test "$cf_cv_srand_func" != unknown ; then echo $ac_n "checking for range of random-integers""... $ac_c" 1>&6 -echo "configure:10616: checking for range of random-integers" >&5 +echo "configure:10732: checking for range of random-integers" >&5 if eval "test \"`echo '$''{'cf_cv_rand_max'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10628,7 +10744,7 @@ else ;; esac cat > conftest.$ac_ext <<EOF -#line 10632 "configure" +#line 10748 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -10642,7 +10758,7 @@ int main() { long x = $cf_cv_rand_max ; return 0; } EOF -if { (eval echo configure:10646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10762: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -10678,12 +10794,12 @@ for ac_func in strstr do echo $ac_n "checking for $ac_func declaration""... $ac_c" 1>&6 -echo "configure:10682: checking for $ac_func declaration" >&5 +echo "configure:10798: 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 10687 "configure" +#line 10803 "configure" #include "confdefs.h" #include <string.h> int main() { @@ -10692,11 +10808,11 @@ extern int ${ac_func}(); #endif ; return 0; } EOF -if { (eval echo configure:10696: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10812: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 10700 "configure" +#line 10816 "configure" #include "confdefs.h" #include <string.h> int main() { @@ -10705,7 +10821,7 @@ int (*p)() = ${ac_func}; #endif ; return 0; } EOF -if { (eval echo configure:10709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_decl_$ac_func=yes" @@ -10747,12 +10863,12 @@ for ac_func in getgrgid getgrnam do echo $ac_n "checking for $ac_func declaration""... $ac_c" 1>&6 -echo "configure:10751: checking for $ac_func declaration" >&5 +echo "configure:10867: 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 10756 "configure" +#line 10872 "configure" #include "confdefs.h" #include <stdio.h> @@ -10763,11 +10879,11 @@ extern int ${ac_func}(); #endif ; return 0; } EOF -if { (eval echo configure:10767: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 10771 "configure" +#line 10887 "configure" #include "confdefs.h" #include <stdio.h> @@ -10778,7 +10894,7 @@ int (*p)() = ${ac_func}; #endif ; return 0; } EOF -if { (eval echo configure:10782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10898: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_decl_$ac_func=yes" @@ -10820,13 +10936,13 @@ done echo $ac_n "checking if TRUE/FALSE are defined""... $ac_c" 1>&6 -echo "configure:10824: checking if TRUE/FALSE are defined" >&5 +echo "configure:10940: 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 10830 "configure" +#line 10946 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -10835,7 +10951,7 @@ int main() { int x = TRUE, y = FALSE ; return 0; } EOF -if { (eval echo configure:10839: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10955: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_bool_defs=yes else @@ -10862,13 +10978,13 @@ fi echo $ac_n "checking if external errno is declared""... $ac_c" 1>&6 -echo "configure:10866: checking if external errno is declared" >&5 +echo "configure:10982: checking if external errno is declared" >&5 if eval "test \"`echo '$''{'cf_cv_dcl_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10872 "configure" +#line 10988 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -10881,7 +10997,7 @@ int main() { long x = (long) errno ; return 0; } EOF -if { (eval echo configure:10885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11001: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_dcl_'errno'=yes' else @@ -10912,13 +11028,13 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist echo $ac_n "checking if external errno exists""... $ac_c" 1>&6 -echo "configure:10916: checking if external errno exists" >&5 +echo "configure:11032: checking if external errno exists" >&5 if eval "test \"`echo '$''{'cf_cv_have_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10922 "configure" +#line 11038 "configure" #include "confdefs.h" #undef errno @@ -10928,7 +11044,7 @@ int main() { errno = 2 ; return 0; } EOF -if { (eval echo configure:10932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval 'cf_cv_have_'errno'=yes' else @@ -10960,21 +11076,21 @@ fi echo $ac_n "checking if we can set errno""... $ac_c" 1>&6 -echo "configure:10964: checking if we can set errno" >&5 +echo "configure:11080: checking if we can set errno" >&5 if eval "test \"`echo '$''{'cf_cv_set_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext <<EOF -#line 10971 "configure" +#line 11087 "configure" #include "confdefs.h" #include <errno.h> int main() { errno = 255 ; return 0; } EOF -if { (eval echo configure:10978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_set_errno=maybe else @@ -10986,7 +11102,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext <<EOF -#line 10990 "configure" +#line 11106 "configure" #include "confdefs.h" #include <errno.h> @@ -10996,7 +11112,7 @@ int main() exit(errno != 255); } EOF -if { (eval echo configure:11000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_set_errno=yes else @@ -11019,20 +11135,20 @@ EOF echo $ac_n "checking for setlocale()""... $ac_c" 1>&6 -echo "configure:11023: checking for setlocale()" >&5 +echo "configure:11139: 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 11029 "configure" +#line 11145 "configure" #include "confdefs.h" #include <locale.h> int main() { setlocale(LC_ALL, "") ; return 0; } EOF -if { (eval echo configure:11036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_locale=yes else @@ -11053,13 +11169,13 @@ EOF echo $ac_n "checking if NGROUPS is defined""... $ac_c" 1>&6 -echo "configure:11057: checking if NGROUPS is defined" >&5 +echo "configure:11173: 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 11063 "configure" +#line 11179 "configure" #include "confdefs.h" #if HAVE_SYS_PARAM_H @@ -11073,7 +11189,7 @@ int main() { int x = NGROUPS ; return 0; } EOF -if { (eval echo configure:11077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ngroups=yes else @@ -11081,7 +11197,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 11085 "configure" +#line 11201 "configure" #include "confdefs.h" #if HAVE_SYS_PARAM_H @@ -11095,7 +11211,7 @@ int main() { int x = NGROUPS_MAX ; return 0; } EOF -if { (eval echo configure:11099: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ngroups=NGROUPS_MAX else @@ -11129,13 +11245,13 @@ for cf_name in sys_nerr sys_errlist do echo $ac_n "checking if external $cf_name is declared""... $ac_c" 1>&6 -echo "configure:11133: checking if external $cf_name is declared" >&5 +echo "configure:11249: checking if external $cf_name is declared" >&5 if eval "test \"`echo '$''{'cf_cv_dcl_$cf_name'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11139 "configure" +#line 11255 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -11148,7 +11264,7 @@ int main() { long x = (long) $cf_name ; return 0; } EOF -if { (eval echo configure:11152: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11268: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_dcl_'$cf_name'=yes' else @@ -11179,13 +11295,13 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist echo $ac_n "checking if external $cf_name exists""... $ac_c" 1>&6 -echo "configure:11183: checking if external $cf_name exists" >&5 +echo "configure:11299: checking if external $cf_name exists" >&5 if eval "test \"`echo '$''{'cf_cv_have_$cf_name'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11189 "configure" +#line 11305 "configure" #include "confdefs.h" #undef $cf_name @@ -11195,7 +11311,7 @@ int main() { $cf_name = 2 ; return 0; } EOF -if { (eval echo configure:11199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval 'cf_cv_have_'$cf_name'=yes' else @@ -11231,17 +11347,17 @@ for ac_hdr in lastlog.h paths.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11235: checking for $ac_hdr" >&5 +echo "configure:11351: 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 11240 "configure" +#line 11356 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11361: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11268,13 +11384,13 @@ fi done echo $ac_n "checking for lastlog path""... $ac_c" 1>&6 -echo "configure:11272: checking for lastlog path" >&5 +echo "configure:11388: checking for lastlog path" >&5 if eval "test \"`echo '$''{'cf_cv_path_lastlog'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11278 "configure" +#line 11394 "configure" #include "confdefs.h" #include <sys/types.h> @@ -11289,7 +11405,7 @@ int main() { char *path = _PATH_LASTLOG ; return 0; } EOF -if { (eval echo configure:11293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_path_lastlog="_PATH_LASTLOG" else @@ -11316,7 +11432,7 @@ EOF echo $ac_n "checking for utmp implementation""... $ac_c" 1>&6 -echo "configure:11320: checking for utmp implementation" >&5 +echo "configure:11436: checking for utmp implementation" >&5 if eval "test \"`echo '$''{'cf_cv_have_utmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11324,7 +11440,7 @@ else cf_cv_have_utmp=no for cf_header in utmpx utmp ; do cat > conftest.$ac_ext <<EOF -#line 11328 "configure" +#line 11444 "configure" #include "confdefs.h" #include <sys/types.h> @@ -11340,7 +11456,7 @@ struct $cf_header x; ; return 0; } EOF -if { (eval echo configure:11344: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_have_utmp=$cf_header break @@ -11350,7 +11466,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 11354 "configure" +#line 11470 "configure" #include "confdefs.h" #include <sys/types.h> @@ -11366,7 +11482,7 @@ struct $cf_header x; ; return 0; } EOF -if { (eval echo configure:11370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_have_utmp=$cf_header cat >> confdefs.h <<\EOF @@ -11401,13 +11517,13 @@ EOF if test $cf_cv_have_utmp != no ; then echo $ac_n "checking if utmp.ut_host is declared""... $ac_c" 1>&6 -echo "configure:11405: checking if utmp.ut_host is declared" >&5 +echo "configure:11521: checking if utmp.ut_host is declared" >&5 if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_host'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11411 "configure" +#line 11527 "configure" #include "confdefs.h" #include <sys/types.h> @@ -11416,7 +11532,7 @@ int main() { struct $cf_cv_have_utmp x; char *y = &x.ut_host[0] ; return 0; } EOF -if { (eval echo configure:11420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_have_utmp_ut_host=yes else @@ -11440,7 +11556,7 @@ fi if test $cf_cv_have_utmp != no ; then echo $ac_n "checking for exit-status in $cf_cv_have_utmp""... $ac_c" 1>&6 -echo "configure:11444: checking for exit-status in $cf_cv_have_utmp" >&5 +echo "configure:11560: checking for exit-status in $cf_cv_have_utmp" >&5 if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_xstatus'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11452,7 +11568,7 @@ for cf_result in \ ut_exit.ut_exit do cat > conftest.$ac_ext <<EOF -#line 11456 "configure" +#line 11572 "configure" #include "confdefs.h" #include <sys/types.h> @@ -11461,7 +11577,7 @@ int main() { struct $cf_cv_have_utmp x; long y = x.$cf_result = 0 ; return 0; } EOF -if { (eval echo configure:11465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11581: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_have_utmp_ut_xstatus=$cf_result break @@ -11493,13 +11609,13 @@ fi if test $cf_cv_have_utmp != no ; then echo $ac_n "checking if utmp.ut_xtime is declared""... $ac_c" 1>&6 -echo "configure:11497: checking if utmp.ut_xtime is declared" >&5 +echo "configure:11613: checking if utmp.ut_xtime is declared" >&5 if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_xtime'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11503 "configure" +#line 11619 "configure" #include "confdefs.h" #include <sys/types.h> @@ -11508,7 +11624,7 @@ int main() { struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0 ; return 0; } EOF -if { (eval echo configure:11512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11628: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_have_utmp_ut_xtime=yes else @@ -11516,7 +11632,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 11520 "configure" +#line 11636 "configure" #include "confdefs.h" #include <sys/types.h> @@ -11525,7 +11641,7 @@ int main() { struct $cf_cv_have_utmp x; long y = x.ut_tv.tv_sec ; return 0; } EOF -if { (eval echo configure:11529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_have_utmp_ut_xtime=define else @@ -11560,13 +11676,13 @@ fi if test $cf_cv_have_utmp != no ; then echo $ac_n "checking if utmp.ut_session is declared""... $ac_c" 1>&6 -echo "configure:11564: checking if utmp.ut_session is declared" >&5 +echo "configure:11680: checking if utmp.ut_session is declared" >&5 if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_session'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11570 "configure" +#line 11686 "configure" #include "confdefs.h" #include <sys/types.h> @@ -11575,7 +11691,7 @@ int main() { struct $cf_cv_have_utmp x; long y = x.ut_session ; return 0; } EOF -if { (eval echo configure:11579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_have_utmp_ut_session=yes else @@ -11600,14 +11716,14 @@ fi echo $ac_n "checking if $cf_cv_have_utmp is SYSV flavor""... $ac_c" 1>&6 -echo "configure:11604: checking if $cf_cv_have_utmp is SYSV flavor" >&5 +echo "configure:11720: checking if $cf_cv_have_utmp is SYSV flavor" >&5 if eval "test \"`echo '$''{'cf_cv_sysv_utmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx" cat > conftest.$ac_ext <<EOF -#line 11611 "configure" +#line 11727 "configure" #include "confdefs.h" #include <sys/types.h> @@ -11621,7 +11737,7 @@ struct $cf_cv_have_utmp x; end${cf_prefix}ent(); ; return 0; } EOF -if { (eval echo configure:11625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_sysv_utmp=yes else @@ -11644,13 +11760,13 @@ fi echo $ac_n "checking if external h_errno exists""... $ac_c" 1>&6 -echo "configure:11648: checking if external h_errno exists" >&5 +echo "configure:11764: checking if external h_errno exists" >&5 if eval "test \"`echo '$''{'cf_cv_have_h_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11654 "configure" +#line 11770 "configure" #include "confdefs.h" #undef h_errno @@ -11660,7 +11776,7 @@ int main() { h_errno = 2 ; return 0; } EOF -if { (eval echo configure:11664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval 'cf_cv_have_'h_errno'=yes' else @@ -11696,17 +11812,17 @@ if test $cf_cv_screen != slang ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11700: checking for $ac_hdr" >&5 +echo "configure:11816: 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 11705 "configure" +#line 11821 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11735,7 +11851,7 @@ done fi echo $ac_n "checking if curses supports alternate-character set""... $ac_c" 1>&6 -echo "configure:11739: checking if curses supports alternate-character set" >&5 +echo "configure:11855: 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 @@ -11743,7 +11859,7 @@ else for mapname in acs_map _acs_map do cat > conftest.$ac_ext <<EOF -#line 11747 "configure" +#line 11863 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -11752,7 +11868,7 @@ int main() { chtype x = $mapname['l']; $mapname['m'] = 0 ; return 0; } EOF -if { (eval echo configure:11756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_alt_char_set=$mapname break @@ -11775,13 +11891,13 @@ EOF echo $ac_n "checking if curses supports fancy attributes""... $ac_c" 1>&6 -echo "configure:11779: checking if curses supports fancy attributes" >&5 +echo "configure:11895: 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 11785 "configure" +#line 11901 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -11794,7 +11910,7 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE); ; return 0; } EOF -if { (eval echo configure:11798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_fancy_curses=yes else @@ -11817,13 +11933,13 @@ EOF if test "$cf_cv_ncurses_version" != no ; then echo $ac_n "checking for obsolete/broken version of ncurses""... $ac_c" 1>&6 -echo "configure:11821: checking for obsolete/broken version of ncurses" >&5 +echo "configure:11937: 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 11827 "configure" +#line 11943 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -11837,7 +11953,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_broken=no else @@ -11862,13 +11978,13 @@ fi echo $ac_n "checking if curses supports color attributes""... $ac_c" 1>&6 -echo "configure:11866: checking if curses supports color attributes" >&5 +echo "configure:11982: 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 11872 "configure" +#line 11988 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -11883,7 +11999,7 @@ chtype x = COLOR_BLUE; ; return 0; } EOF -if { (eval echo configure:11887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_color_curses=yes else @@ -11917,17 +12033,17 @@ unistd.h \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11921: checking for $ac_hdr" >&5 +echo "configure:12037: 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 11926 "configure" +#line 12042 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11931: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12047: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11958,17 +12074,17 @@ if test "$ISC" = yes ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11962: checking for $ac_hdr" >&5 +echo "configure:12078: 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 11967 "configure" +#line 12083 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11972: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12003,16 +12119,16 @@ if test "$ac_cv_header_termios_h" = yes ; then esac if test "$termios_bad" = maybe ; then echo $ac_n "checking whether termios.h needs _POSIX_SOURCE""... $ac_c" 1>&6 -echo "configure:12007: checking whether termios.h needs _POSIX_SOURCE" >&5 +echo "configure:12123: checking whether termios.h needs _POSIX_SOURCE" >&5 cat > conftest.$ac_ext <<EOF -#line 12009 "configure" +#line 12125 "configure" #include "confdefs.h" #include <termios.h> int main() { struct termios foo; int x = foo.c_iflag ; return 0; } EOF -if { (eval echo configure:12016: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12132: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* termios_bad=no else @@ -12021,7 +12137,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 12025 "configure" +#line 12141 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -12030,7 +12146,7 @@ int main() { struct termios foo; int x = foo.c_iflag ; return 0; } EOF -if { (eval echo configure:12034: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* termios_bad=unknown else @@ -12053,7 +12169,7 @@ fi echo $ac_n "checking declaration of size-change""... $ac_c" 1>&6 -echo "configure:12057: checking declaration of size-change" >&5 +echo "configure:12173: 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 @@ -12067,7 +12183,7 @@ do CPPFLAGS="$cf_save_CPPFLAGS" test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" cat > conftest.$ac_ext <<EOF -#line 12071 "configure" +#line 12187 "configure" #include "confdefs.h" #include <sys/types.h> #ifdef HAVE_TERMIOS_H @@ -12106,7 +12222,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sizechange=yes else @@ -12145,20 +12261,20 @@ fi echo $ac_n "checking if ttytype is declared in curses library""... $ac_c" 1>&6 -echo "configure:12149: checking if ttytype is declared in curses library" >&5 +echo "configure:12265: 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 12155 "configure" +#line 12271 "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:12162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_have_ttytype=yes else @@ -12179,13 +12295,13 @@ EOF echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6 -echo "configure:12183: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "configure:12299: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 if eval "test \"`echo '$''{'cf_cv_need_xopen_extension'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 12189 "configure" +#line 12305 "configure" #include "confdefs.h" #include <stdlib.h> @@ -12195,7 +12311,7 @@ int main() { long x = winnstr(stdscr, "", 0) ; return 0; } EOF -if { (eval echo configure:12199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_need_xopen_extension=no else @@ -12203,7 +12319,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 12207 "configure" +#line 12323 "configure" #include "confdefs.h" #define _XOPEN_SOURCE_EXTENDED @@ -12214,7 +12330,7 @@ int main() { long x = winnstr(stdscr, "", 0) ; return 0; } EOF -if { (eval echo configure:12218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_need_xopen_extension=yes else @@ -12257,9 +12373,9 @@ do cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` echo $ac_n "checking for ${cf_func}""... $ac_c" 1>&6 -echo "configure:12261: checking for ${cf_func}" >&5 +echo "configure:12377: checking for ${cf_func}" >&5 -echo "(line 12263) testing ${cf_func} ..." 1>&5 +echo "(line 12379) testing ${cf_func} ..." 1>&5 if eval "test \"`echo '$''{'cf_cv_func_$cf_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12268,7 +12384,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat > conftest.$ac_ext <<EOF -#line 12272 "configure" +#line 12388 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -12293,7 +12409,7 @@ exit(foo == 0); ; return 0; } EOF -if { (eval echo configure:12297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -12325,7 +12441,7 @@ fi echo $ac_n "checking if bibp: URLs should be supported""... $ac_c" 1>&6 -echo "configure:12329: checking if bibp: URLs should be supported" >&5 +echo "configure:12445: checking if bibp: URLs should be supported" >&5 # Check whether --enable-bibp-urls or --disable-bibp-urls was given. if test "${enable_bibp_urls+set}" = set; then @@ -12349,7 +12465,7 @@ EOF echo $ac_n "checking if configuration info should be browsable""... $ac_c" 1>&6 -echo "configure:12353: checking if configuration info should be browsable" >&5 +echo "configure:12469: 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 @@ -12373,7 +12489,7 @@ EOF echo $ac_n "checking if new-style forms-based options screen should be used""... $ac_c" 1>&6 -echo "configure:12377: checking if new-style forms-based options screen should be used" >&5 +echo "configure:12493: 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 @@ -12397,7 +12513,7 @@ EOF echo $ac_n "checking if old-style options menu should be used""... $ac_c" 1>&6 -echo "configure:12401: checking if old-style options menu should be used" >&5 +echo "configure:12517: 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 @@ -12421,7 +12537,7 @@ EOF echo $ac_n "checking if experimental address-list page should be used""... $ac_c" 1>&6 -echo "configure:12425: checking if experimental address-list page should be used" >&5 +echo "configure:12541: checking if experimental address-list page should be used" >&5 # Check whether --enable-addrlist-page or --disable-addrlist-page was given. if test "${enable_addrlist_page+set}" = set; then @@ -12445,7 +12561,7 @@ EOF echo $ac_n "checking if experimental charset-selection logic should be used""... $ac_c" 1>&6 -echo "configure:12449: checking if experimental charset-selection logic should be used" >&5 +echo "configure:12565: checking if experimental charset-selection logic should be used" >&5 # Check whether --enable-charset-choice or --disable-charset-choice was given. if test "${enable_charset_choice+set}" = set; then @@ -12469,7 +12585,7 @@ EOF echo $ac_n "checking if experimental CJK logic should be used""... $ac_c" 1>&6 -echo "configure:12473: checking if experimental CJK logic should be used" >&5 +echo "configure:12589: checking if experimental CJK logic should be used" >&5 # Check whether --enable-cjk or --disable-cjk was given. if test "${enable_cjk+set}" = set; then @@ -12493,7 +12609,7 @@ EOF echo $ac_n "checking if color-style code should be used""... $ac_c" 1>&6 -echo "configure:12497: checking if color-style code should be used" >&5 +echo "configure:12613: 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 @@ -12533,7 +12649,7 @@ EOF echo "$ac_t""yes" 1>&6 echo $ac_n "checking for location of style-sheet file""... $ac_c" 1>&6 -echo "configure:12537: checking for location of style-sheet file" >&5 +echo "configure:12653: 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" @@ -12551,7 +12667,7 @@ test ".$cf_cv_func_use_default_colors" = ".yes" && use_dft_colors=maybe if test "$use_dft_colors" != no ; then echo $ac_n "checking if you want to use default-colors""... $ac_c" 1>&6 -echo "configure:12555: checking if you want to use default-colors" >&5 +echo "configure:12671: 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 @@ -12576,7 +12692,7 @@ EOF fi echo $ac_n "checking if experimental file-upload logic should be used""... $ac_c" 1>&6 -echo "configure:12580: checking if experimental file-upload logic should be used" >&5 +echo "configure:12696: checking if experimental file-upload logic should be used" >&5 # Check whether --enable-file-upload or --disable-file-upload was given. if test "${enable_file_upload+set}" = set; then @@ -12600,7 +12716,7 @@ EOF echo $ac_n "checking if experimental htmlized lynx.cfg should be built""... $ac_c" 1>&6 -echo "configure:12604: checking if experimental htmlized lynx.cfg should be built" >&5 +echo "configure:12720: checking if experimental htmlized lynx.cfg should be built" >&5 # Check whether --enable-htmlized-cfg or --disable-htmlized-cfg was given. if test "${enable_htmlized_cfg+set}" = set; then @@ -12630,7 +12746,7 @@ fi ### check for ipv6 support echo $ac_n "checking whether to enable ipv6""... $ac_c" 1>&6 -echo "configure:12634: checking whether to enable ipv6" >&5 +echo "configure:12750: checking whether to enable ipv6" >&5 # Check whether --enable-ipv6 or --disable-ipv6 was given. if test "${enable_ipv6+set}" = set; then @@ -12651,7 +12767,7 @@ if test "$enableval" = "yes"; then echo $ac_n "checking ipv6 stack type""... $ac_c" 1>&6 -echo "configure:12655: checking ipv6 stack type" >&5 +echo "configure:12771: checking ipv6 stack type" >&5 if eval "test \"`echo '$''{'cf_cv_ipv6type'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12671,7 +12787,7 @@ do ;; inria) #(vi cat > conftest.$ac_ext <<EOF -#line 12675 "configure" +#line 12791 "configure" #include "confdefs.h" dnl #include <netinet/in.h> @@ -12689,7 +12805,7 @@ rm -f conftest* ;; kame) #(vi cat > conftest.$ac_ext <<EOF -#line 12693 "configure" +#line 12809 "configure" #include "confdefs.h" dnl #include <netinet/in.h> @@ -12707,7 +12823,7 @@ rm -f conftest* ;; linux-glibc) #(vi cat > conftest.$ac_ext <<EOF -#line 12711 "configure" +#line 12827 "configure" #include "confdefs.h" dnl #include <features.h> @@ -12734,7 +12850,7 @@ rm -f conftest* ;; toshiba) #(vi cat > conftest.$ac_ext <<EOF -#line 12738 "configure" +#line 12854 "configure" #include "confdefs.h" dnl #include <sys/param.h> @@ -12752,7 +12868,7 @@ rm -f conftest* ;; v6d) #(vi cat > conftest.$ac_ext <<EOF -#line 12756 "configure" +#line 12872 "configure" #include "confdefs.h" dnl #include </usr/local/v6/include/sys/v6config.h> @@ -12770,7 +12886,7 @@ rm -f conftest* ;; zeta) cat > conftest.$ac_ext <<EOF -#line 12774 "configure" +#line 12890 "configure" #include "confdefs.h" dnl #include <sys/param.h> @@ -12803,7 +12919,7 @@ cf_ipv6lib=none cf_ipv6dir=none echo $ac_n "checking for ipv6 library if required""... $ac_c" 1>&6 -echo "configure:12807: checking for ipv6 library if required" >&5 +echo "configure:12923: checking for ipv6 library if required" >&5 case $cf_cv_ipv6type in #(vi solaris) #(vi ;; @@ -12837,7 +12953,7 @@ echo "$ac_t""$cf_ipv6lib" 1>&6 if test "$cf_ipv6lib" != "none"; then cat > conftest.$ac_ext <<EOF -#line 12841 "configure" +#line 12957 "configure" #include "confdefs.h" #include <sys/types.h> @@ -12848,7 +12964,7 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:12852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -12901,12 +13017,12 @@ rm -f conftest* eval 'cf_cv_have_lib_'$cf_ipv6lib'=no' cf_libdir="" echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6 -echo "configure:12905: checking for getaddrinfo" >&5 +echo "configure:13021: checking for getaddrinfo" >&5 if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 12910 "configure" +#line 13026 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getaddrinfo(); below. */ @@ -12929,7 +13045,7 @@ getaddrinfo(); ; return 0; } EOF -if { (eval echo configure:12933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getaddrinfo=yes" else @@ -12949,10 +13065,10 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for getaddrinfo in -l$cf_ipv6lib""... $ac_c" 1>&6 -echo "configure:12953: checking for getaddrinfo in -l$cf_ipv6lib" >&5 +echo "configure:13069: checking for getaddrinfo in -l$cf_ipv6lib" >&5 LIBS="-l$cf_ipv6lib $LIBS" cat > conftest.$ac_ext <<EOF -#line 12956 "configure" +#line 13072 "configure" #include "confdefs.h" #include <sys/types.h> @@ -12963,7 +13079,7 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:12967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes' @@ -13007,10 +13123,10 @@ cf_search="$cf_search $HOME/lib $HOME/lib/$cf_ipv6dir $HOME/$cf_ipv6dir/lib" for cf_libdir in $cf_search do echo $ac_n "checking for -l$cf_ipv6lib in $cf_libdir""... $ac_c" 1>&6 -echo "configure:13011: checking for -l$cf_ipv6lib in $cf_libdir" >&5 +echo "configure:13127: checking for -l$cf_ipv6lib in $cf_libdir" >&5 LIBS="-L$cf_libdir -l$cf_ipv6lib $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 13014 "configure" +#line 13130 "configure" #include "confdefs.h" #include <sys/types.h> @@ -13021,7 +13137,7 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:13025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes' @@ -13054,7 +13170,7 @@ fi echo $ac_n "checking working getaddrinfo""... $ac_c" 1>&6 -echo "configure:13058: checking working getaddrinfo" >&5 +echo "configure:13174: checking working getaddrinfo" >&5 if eval "test \"`echo '$''{'cf_cv_getaddrinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13063,7 +13179,7 @@ if test "$cross_compiling" = yes; then cf_cv_getaddrinfo=unknown else cat > conftest.$ac_ext <<EOF -#line 13067 "configure" +#line 13183 "configure" #include "confdefs.h" #include <sys/types.h> @@ -13142,7 +13258,7 @@ int main() } EOF -if { (eval echo configure:13146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_getaddrinfo=yes else @@ -13185,7 +13301,7 @@ fi fi echo $ac_n "checking if experimental element-justification logic should be used""... $ac_c" 1>&6 -echo "configure:13189: checking if experimental element-justification logic should be used" >&5 +echo "configure:13305: checking if experimental element-justification logic should be used" >&5 # Check whether --enable-justify-elts or --disable-justify-elts was given. if test "${enable_justify_elts+set}" = set; then @@ -13209,7 +13325,7 @@ EOF echo $ac_n "checking if experimental keyboard-layout logic should be used""... $ac_c" 1>&6 -echo "configure:13213: checking if experimental keyboard-layout logic should be used" >&5 +echo "configure:13329: checking if experimental keyboard-layout logic should be used" >&5 # Check whether --enable-kbd-layout or --disable-kbd-layout was given. if test "${enable_kbd_layout+set}" = set; then @@ -13233,7 +13349,7 @@ EOF echo $ac_n "checking if experimental JavaScript support should be used""... $ac_c" 1>&6 -echo "configure:13237: checking if experimental JavaScript support should be used" >&5 +echo "configure:13353: checking if experimental JavaScript support should be used" >&5 # Check whether --enable-libjs or --disable-libjs was given. if test "${enable_libjs+set}" = set; then @@ -13257,7 +13373,7 @@ EOF echo $ac_n "checking if experimental nested-table logic should be used""... $ac_c" 1>&6 -echo "configure:13261: checking if experimental nested-table logic should be used" >&5 +echo "configure:13377: checking if experimental nested-table logic should be used" >&5 # Check whether --enable-nested-tables or --disable-nested-tables was given. if test "${enable_nested_tables+set}" = set; then @@ -13281,7 +13397,7 @@ EOF echo $ac_n "checking if html source should be colorized""... $ac_c" 1>&6 -echo "configure:13285: checking if html source should be colorized" >&5 +echo "configure:13401: checking if html source should be colorized" >&5 # Check whether --enable-prettysrc or --disable-prettysrc was given. if test "${enable_prettysrc+set}" = set; then @@ -13305,7 +13421,7 @@ EOF echo $ac_n "checking if read-progress message should show ETA""... $ac_c" 1>&6 -echo "configure:13309: checking if read-progress message should show ETA" >&5 +echo "configure:13425: checking if read-progress message should show ETA" >&5 # Check whether --enable-read-eta or --disable-read-eta was given. if test "${enable_read_eta+set}" = set; then @@ -13329,7 +13445,7 @@ EOF echo $ac_n "checking if scrollbar code should be used""... $ac_c" 1>&6 -echo "configure:13333: checking if scrollbar code should be used" >&5 +echo "configure:13449: checking if scrollbar code should be used" >&5 # Check whether --enable-scrollbar or --disable-scrollbar was given. if test "${enable_scrollbar+set}" = set; then @@ -13360,7 +13476,7 @@ EOF fi echo $ac_n "checking if source caching should be used""... $ac_c" 1>&6 -echo "configure:13364: checking if source caching should be used" >&5 +echo "configure:13480: checking if source caching should be used" >&5 # Check whether --enable-source-cache or --disable-source-cache was given. if test "${enable_source_cache+set}" = set; then @@ -13387,7 +13503,7 @@ EOF echo $ac_n "checking if alternative line-edit bindings should be used""... $ac_c" 1>&6 -echo "configure:13391: checking if alternative line-edit bindings should be used" >&5 +echo "configure:13507: checking if alternative line-edit bindings should be used" >&5 # Check whether --enable-alt-bindings or --disable-alt-bindings was given. if test "${enable_alt_bindings+set}" = set; then @@ -13411,7 +13527,7 @@ EOF echo $ac_n "checking if you want to use extended HTML DTD logic""... $ac_c" 1>&6 -echo "configure:13415: checking if you want to use extended HTML DTD logic" >&5 +echo "configure:13531: 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 @@ -13435,7 +13551,7 @@ EOF echo $ac_n "checking if partial-display should be used""... $ac_c" 1>&6 -echo "configure:13439: checking if partial-display should be used" >&5 +echo "configure:13555: checking if partial-display should be used" >&5 # Check whether --enable-partial or --disable-partial was given. if test "${enable_partial+set}" = set; then @@ -13459,7 +13575,7 @@ EOF echo $ac_n "checking if you want to use external commands""... $ac_c" 1>&6 -echo "configure:13463: checking if you want to use external commands" >&5 +echo "configure:13579: 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 @@ -13486,7 +13602,7 @@ EOF fi echo $ac_n "checking if you want to use setfont support""... $ac_c" 1>&6 -echo "configure:13490: checking if you want to use setfont support" >&5 +echo "configure:13606: 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 @@ -13510,7 +13626,7 @@ EOF echo $ac_n "checking if you want cgi-link support""... $ac_c" 1>&6 -echo "configure:13514: checking if you want cgi-link support" >&5 +echo "configure:13630: 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 @@ -13529,7 +13645,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you want change-exec support""... $ac_c" 1>&6 -echo "configure:13533: checking if you want change-exec support" >&5 +echo "configure:13649: checking if you want change-exec support" >&5 # Check whether --enable-change-exec or --disable-change-exec was given. if test "${enable_change_exec+set}" = set; then @@ -13553,7 +13669,7 @@ EOF echo $ac_n "checking if you want exec-links support""... $ac_c" 1>&6 -echo "configure:13557: checking if you want exec-links support" >&5 +echo "configure:13673: 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 @@ -13577,7 +13693,7 @@ EOF echo $ac_n "checking if you want exec-scripts support""... $ac_c" 1>&6 -echo "configure:13581: checking if you want exec-scripts support" >&5 +echo "configure:13697: 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 @@ -13601,7 +13717,7 @@ EOF echo $ac_n "checking if you want internal-links feature""... $ac_c" 1>&6 -echo "configure:13605: checking if you want internal-links feature" >&5 +echo "configure:13721: 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 @@ -13625,7 +13741,7 @@ EOF echo $ac_n "checking if you want to fork NSL requests""... $ac_c" 1>&6 -echo "configure:13629: checking if you want to fork NSL requests" >&5 +echo "configure:13745: 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 @@ -13649,7 +13765,7 @@ EOF echo $ac_n "checking if you want to log URL requests via syslog""... $ac_c" 1>&6 -echo "configure:13653: checking if you want to log URL requests via syslog" >&5 +echo "configure:13769: 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 @@ -13673,7 +13789,7 @@ EOF echo $ac_n "checking if persistent-cookie logic should be used""... $ac_c" 1>&6 -echo "configure:13677: checking if persistent-cookie logic should be used" >&5 +echo "configure:13793: checking if persistent-cookie logic should be used" >&5 # Check whether --enable-persistent-cookies or --disable-persistent-cookies was given. if test "${enable_persistent_cookies+set}" = set; then @@ -13697,7 +13813,7 @@ EOF echo $ac_n "checking if you want to underline links""... $ac_c" 1>&6 -echo "configure:13701: checking if you want to underline links" >&5 +echo "configure:13817: checking if you want to underline links" >&5 # Check whether --enable-underlines or --disable-underlines was given. if test "${enable_underlines+set}" = set; then @@ -13721,7 +13837,7 @@ EOF echo $ac_n "checking if help files should be gzip'ed""... $ac_c" 1>&6 -echo "configure:13725: checking if help files should be gzip'ed" >&5 +echo "configure:13841: 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 @@ -13750,7 +13866,7 @@ fi echo $ac_n "checking if you want to use zlib for decompression of some gzip files""... $ac_c" 1>&6 -echo "configure:13754: checking if you want to use zlib for decompression of some gzip files" >&5 +echo "configure:13870: 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 @@ -13764,16 +13880,16 @@ echo "$ac_t""$use_zlib" 1>&6 if test ".$use_zlib" != ".no" ; then echo $ac_n "checking if we need to add -I option to get zlib.h""... $ac_c" 1>&6 -echo "configure:13768: checking if we need to add -I option to get zlib.h" >&5 +echo "configure:13884: checking if we need to add -I option to get zlib.h" >&5 cat > conftest.$ac_ext <<EOF -#line 13770 "configure" +#line 13886 "configure" #include "confdefs.h" #include <zlib.h> int main() { ; return 0; } EOF -if { (eval echo configure:13777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -13845,12 +13961,12 @@ rm -f conftest* eval 'cf_cv_have_lib_'z'=no' cf_libdir="" echo $ac_n "checking for gzopen""... $ac_c" 1>&6 -echo "configure:13849: checking for gzopen" >&5 +echo "configure:13965: 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 13854 "configure" +#line 13970 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gzopen(); below. */ @@ -13873,7 +13989,7 @@ gzopen(); ; return 0; } EOF -if { (eval echo configure:13877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gzopen=yes" else @@ -13893,17 +14009,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for gzopen in -lz""... $ac_c" 1>&6 -echo "configure:13897: checking for gzopen in -lz" >&5 +echo "configure:14013: checking for gzopen in -lz" >&5 LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 13900 "configure" +#line 14016 "configure" #include "confdefs.h" #include <zlib.h> int main() { gzopen("name","mode") ; return 0; } EOF -if { (eval echo configure:13907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'z'=yes' @@ -13947,17 +14063,17 @@ cf_search="$cf_search $HOME/lib $HOME/lib/z $HOME/z/lib" for cf_libdir in $cf_search do echo $ac_n "checking for -lz in $cf_libdir""... $ac_c" 1>&6 -echo "configure:13951: checking for -lz in $cf_libdir" >&5 +echo "configure:14067: checking for -lz in $cf_libdir" >&5 LIBS="-L$cf_libdir -lz $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 13954 "configure" +#line 14070 "configure" #include "confdefs.h" #include <zlib.h> int main() { gzopen("name","mode") ; return 0; } EOF -if { (eval echo configure:13961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'z'=yes' @@ -13991,7 +14107,7 @@ EOF fi echo $ac_n "checking if you want to exclude FINGER code""... $ac_c" 1>&6 -echo "configure:13995: checking if you want to exclude FINGER code" >&5 +echo "configure:14111: checking if you want to exclude FINGER code" >&5 # Check whether --enable-finger or --disable-finger was given. if test "${enable_finger+set}" = set; then @@ -14015,7 +14131,7 @@ EOF echo $ac_n "checking if you want to exclude GOPHER code""... $ac_c" 1>&6 -echo "configure:14019: checking if you want to exclude GOPHER code" >&5 +echo "configure:14135: checking if you want to exclude GOPHER code" >&5 # Check whether --enable-gopher or --disable-gopher was given. if test "${enable_gopher+set}" = set; then @@ -14039,7 +14155,7 @@ EOF echo $ac_n "checking if you want to exclude NEWS code""... $ac_c" 1>&6 -echo "configure:14043: checking if you want to exclude NEWS code" >&5 +echo "configure:14159: checking if you want to exclude NEWS code" >&5 # Check whether --enable-news or --disable-news was given. if test "${enable_news+set}" = set; then @@ -14063,7 +14179,7 @@ EOF echo $ac_n "checking if you want to exclude FTP code""... $ac_c" 1>&6 -echo "configure:14067: checking if you want to exclude FTP code" >&5 +echo "configure:14183: checking if you want to exclude FTP code" >&5 # Check whether --enable-ftp or --disable-ftp was given. if test "${enable_ftp+set}" = set; then @@ -14092,7 +14208,7 @@ EOF # All DirEd functions that were enabled on compilation can be disabled # or modified at run time via DIRED_MENU symbols in lynx.cfg. echo $ac_n "checking if directory-editor code should be used""... $ac_c" 1>&6 -echo "configure:14096: checking if directory-editor code should be used" >&5 +echo "configure:14212: 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 @@ -14119,7 +14235,7 @@ EOF echo $ac_n "checking if you wish to allow extracting from archives via DirEd""... $ac_c" 1>&6 -echo "configure:14123: checking if you wish to allow extracting from archives via DirEd" >&5 +echo "configure:14239: checking if you wish to allow extracting from archives via DirEd" >&5 # Check whether --enable-dired-dearchive or --disable-dired-dearchive was given. if test "${enable_dired_dearchive+set}" = set; then @@ -14138,7 +14254,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if DirEd mode should override keys""... $ac_c" 1>&6 -echo "configure:14142: checking if DirEd mode should override keys" >&5 +echo "configure:14258: checking if DirEd mode should override keys" >&5 # Check whether --enable-dired-override or --disable-dired-override was given. if test "${enable_dired_override+set}" = set; then @@ -14164,7 +14280,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:14168: checking if you wish to allow permissions commands via DirEd" >&5 +echo "configure:14284: 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 @@ -14190,7 +14306,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:14194: checking if you wish to allow executable-permission commands via DirEd" >&5 +echo "configure:14310: 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 @@ -14209,7 +14325,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:14213: checking if you wish to allow "tar" commands from DirEd" >&5 +echo "configure:14329: 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 @@ -14235,7 +14351,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:14239: checking if you wish to allow "uudecode" commands from DirEd" >&5 +echo "configure:14355: 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 @@ -14261,7 +14377,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:14265: checking if you wish to allow "zip" and "unzip" commands from DirEd" >&5 +echo "configure:14381: 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 @@ -14287,7 +14403,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:14291: checking if you wish to allow "gzip" and "gunzip" commands from DirEd" >&5 +echo "configure:14407: 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 @@ -14314,7 +14430,7 @@ fi fi echo $ac_n "checking if you want long-directory listings""... $ac_c" 1>&6 -echo "configure:14318: checking if you want long-directory listings" >&5 +echo "configure:14434: 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 @@ -14340,7 +14456,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if parent-directory references are permitted""... $ac_c" 1>&6 -echo "configure:14344: checking if parent-directory references are permitted" >&5 +echo "configure:14460: 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 @@ -14365,7 +14481,7 @@ if test $cf_cv_screen = pdcurses ; then # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:14369: checking for X" >&5 +echo "configure:14485: checking for X" >&5 # Check whether --with-x or --without-x was given. @@ -14428,12 +14544,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 14432 "configure" +#line 14548 "configure" #include "confdefs.h" #include <$x_direct_test_include> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14553: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14502,14 +14618,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 14506 "configure" +#line 14622 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:14513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -14609,7 +14725,7 @@ clix*) # FIXME: modify the library lookup in autoconf to # allow _s.a suffix ahead of .a echo $ac_n "checking for open in -lc_s""... $ac_c" 1>&6 -echo "configure:14613: checking for open in -lc_s" >&5 +echo "configure:14729: checking for open in -lc_s" >&5 ac_lib_var=`echo c_s'_'open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14617,7 +14733,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_s $LIBS" cat > conftest.$ac_ext <<EOF -#line 14621 "configure" +#line 14737 "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 @@ -14628,7 +14744,7 @@ int main() { open() ; return 0; } EOF -if { (eval echo configure:14632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14645,7 +14761,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 LIBS="-lc_s $LIBS" echo $ac_n "checking for gethostname in -lbsd""... $ac_c" 1>&6 -echo "configure:14649: checking for gethostname in -lbsd" >&5 +echo "configure:14765: checking for gethostname in -lbsd" >&5 ac_lib_var=`echo bsd'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14653,7 +14769,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <<EOF -#line 14657 "configure" +#line 14773 "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 @@ -14664,7 +14780,7 @@ int main() { gethostname() ; return 0; } EOF -if { (eval echo configure:14668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14681,7 +14797,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 LIBS="-lbsd $LIBS" echo $ac_n "checking for gethostname in -lnsl_s""... $ac_c" 1>&6 -echo "configure:14685: checking for gethostname in -lnsl_s" >&5 +echo "configure:14801: checking for gethostname in -lnsl_s" >&5 ac_lib_var=`echo nsl_s'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14689,7 +14805,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl_s $LIBS" cat > conftest.$ac_ext <<EOF -#line 14693 "configure" +#line 14809 "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 @@ -14700,7 +14816,7 @@ int main() { gethostname() ; return 0; } EOF -if { (eval echo configure:14704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14717,7 +14833,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 LIBS="-lnsl_s $LIBS" echo $ac_n "checking for XOpenDisplay in -lX11_s""... $ac_c" 1>&6 -echo "configure:14721: checking for XOpenDisplay in -lX11_s" >&5 +echo "configure:14837: checking for XOpenDisplay in -lX11_s" >&5 ac_lib_var=`echo X11_s'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14725,7 +14841,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11_s $LIBS" cat > conftest.$ac_ext <<EOF -#line 14729 "configure" +#line 14845 "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 @@ -14736,7 +14852,7 @@ int main() { XOpenDisplay() ; return 0; } EOF -if { (eval echo configure:14740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14753,7 +14869,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 LIBS="-lX11_s $LIBS" echo $ac_n "checking for XtAppInitialize in -lXt_s""... $ac_c" 1>&6 -echo "configure:14757: checking for XtAppInitialize in -lXt_s" >&5 +echo "configure:14873: checking for XtAppInitialize in -lXt_s" >&5 ac_lib_var=`echo Xt_s'_'XtAppInitialize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14761,7 +14877,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXt_s $LIBS" cat > conftest.$ac_ext <<EOF -#line 14765 "configure" +#line 14881 "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 @@ -14772,7 +14888,7 @@ int main() { XtAppInitialize() ; return 0; } EOF -if { (eval echo configure:14776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14813,7 +14929,7 @@ fi ;; *) echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:14817: checking for socket in -lsocket" >&5 +echo "configure:14933: 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 @@ -14821,7 +14937,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 14825 "configure" +#line 14941 "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 @@ -14832,7 +14948,7 @@ int main() { socket() ; return 0; } EOF -if { (eval echo configure:14836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14860,7 +14976,7 @@ else fi echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:14864: checking for gethostname in -lnsl" >&5 +echo "configure:14980: 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 @@ -14868,7 +14984,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 14872 "configure" +#line 14988 "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 @@ -14879,7 +14995,7 @@ int main() { gethostname() ; return 0; } EOF -if { (eval echo configure:14883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14930,17 +15046,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:14934: checking whether -R must be followed by a space" >&5 +echo "configure:15050: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <<EOF -#line 14937 "configure" +#line 15053 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:14944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -14956,14 +15072,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <<EOF -#line 14960 "configure" +#line 15076 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:14967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -14995,7 +15111,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:14999: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:15115: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15003,7 +15119,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <<EOF -#line 15007 "configure" +#line 15123 "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 @@ -15014,7 +15130,7 @@ int main() { dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:15018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15036,7 +15152,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:15040: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:15156: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15044,7 +15160,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <<EOF -#line 15048 "configure" +#line 15164 "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 @@ -15055,7 +15171,7 @@ int main() { dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:15059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15084,12 +15200,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:15088: checking for gethostbyname" >&5 +echo "configure:15204: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 15093 "configure" +#line 15209 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ @@ -15112,7 +15228,7 @@ gethostbyname(); ; return 0; } EOF -if { (eval echo configure:15116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -15133,7 +15249,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:15137: checking for gethostbyname in -lnsl" >&5 +echo "configure:15253: 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 @@ -15141,7 +15257,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 15145 "configure" +#line 15261 "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 @@ -15152,7 +15268,7 @@ int main() { gethostbyname() ; return 0; } EOF -if { (eval echo configure:15156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15182,12 +15298,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:15186: checking for connect" >&5 +echo "configure:15302: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 15191 "configure" +#line 15307 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ @@ -15210,7 +15326,7 @@ connect(); ; return 0; } EOF -if { (eval echo configure:15214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -15231,7 +15347,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:15235: checking for connect in -lsocket" >&5 +echo "configure:15351: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15239,7 +15355,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 15243 "configure" +#line 15359 "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 @@ -15250,7 +15366,7 @@ int main() { connect() ; return 0; } EOF -if { (eval echo configure:15254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15274,12 +15390,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:15278: checking for remove" >&5 +echo "configure:15394: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 15283 "configure" +#line 15399 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove(); below. */ @@ -15302,7 +15418,7 @@ remove(); ; return 0; } EOF -if { (eval echo configure:15306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -15323,7 +15439,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:15327: checking for remove in -lposix" >&5 +echo "configure:15443: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15331,7 +15447,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <<EOF -#line 15335 "configure" +#line 15451 "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 @@ -15342,7 +15458,7 @@ int main() { remove() ; return 0; } EOF -if { (eval echo configure:15346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15366,12 +15482,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:15370: checking for shmat" >&5 +echo "configure:15486: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 15375 "configure" +#line 15491 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat(); below. */ @@ -15394,7 +15510,7 @@ shmat(); ; return 0; } EOF -if { (eval echo configure:15398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -15415,7 +15531,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:15419: checking for shmat in -lipc" >&5 +echo "configure:15535: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15423,7 +15539,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <<EOF -#line 15427 "configure" +#line 15543 "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 @@ -15434,7 +15550,7 @@ int main() { shmat() ; return 0; } EOF -if { (eval echo configure:15438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15467,7 +15583,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:15471: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:15587: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15475,7 +15591,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 15479 "configure" +#line 15595 "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 @@ -15486,7 +15602,7 @@ int main() { IceConnectionNumber() ; return 0; } EOF -if { (eval echo configure:15490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15531,7 +15647,7 @@ do done echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:15535: checking for XOpenDisplay in -lX11" >&5 +echo "configure:15651: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15539,7 +15655,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 15543 "configure" +#line 15659 "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 @@ -15550,7 +15666,7 @@ int main() { XOpenDisplay() ; return 0; } EOF -if { (eval echo configure:15554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15571,7 +15687,7 @@ else fi echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:15575: checking for XtAppInitialize in -lXt" >&5 +echo "configure:15691: checking for XtAppInitialize in -lXt" >&5 ac_lib_var=`echo Xt'_'XtAppInitialize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15579,7 +15695,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 15583 "configure" +#line 15699 "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 @@ -15590,7 +15706,7 @@ int main() { XtAppInitialize() ; return 0; } EOF -if { (eval echo configure:15594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15665,7 +15781,7 @@ fi echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 -echo "configure:15669: checking for XextCreateExtension in -lXext" >&5 +echo "configure:15785: checking for XextCreateExtension in -lXext" >&5 ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15673,7 +15789,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $LIBS" cat > conftest.$ac_ext <<EOF -#line 15677 "configure" +#line 15793 "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 @@ -15684,7 +15800,7 @@ int main() { XextCreateExtension() ; return 0; } EOF -if { (eval echo configure:15688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15721,13 +15837,13 @@ do if test $cf_path != default ; then CPPFLAGS="-I$cf_path/include $cf_save" echo $ac_n "checking for $cf_test in $cf_path""... $ac_c" 1>&6 -echo "configure:15725: checking for $cf_test in $cf_path" >&5 +echo "configure:15841: checking for $cf_test in $cf_path" >&5 else echo $ac_n "checking for $cf_test""... $ac_c" 1>&6 -echo "configure:15728: checking for $cf_test" >&5 +echo "configure:15844: checking for $cf_test" >&5 fi cat > conftest.$ac_ext <<EOF -#line 15731 "configure" +#line 15847 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> @@ -15736,7 +15852,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15856: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_result=yes else @@ -15762,21 +15878,21 @@ rm -f conftest* if test $cf_path != default ; then LIBS="-L$cf_path/lib $cf_lib $LIBS" echo $ac_n "checking for $cf_lib in $cf_path""... $ac_c" 1>&6 -echo "configure:15766: checking for $cf_lib in $cf_path" >&5 +echo "configure:15882: checking for $cf_lib in $cf_path" >&5 else LIBS="$cf_lib $LIBS" echo $ac_n "checking for $cf_test in $cf_lib""... $ac_c" 1>&6 -echo "configure:15770: checking for $cf_test in $cf_lib" >&5 +echo "configure:15886: checking for $cf_test in $cf_lib" >&5 fi cat > conftest.$ac_ext <<EOF -#line 15773 "configure" +#line 15889 "configure" #include "confdefs.h" int main() { $cf_test() ; return 0; } EOF -if { (eval echo configure:15780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -15835,7 +15951,7 @@ do done echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:15839: checking for XOpenDisplay in -lX11" >&5 +echo "configure:15955: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15843,7 +15959,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 15847 "configure" +#line 15963 "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 @@ -15854,7 +15970,7 @@ int main() { XOpenDisplay() ; return 0; } EOF -if { (eval echo configure:15858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15875,14 +15991,14 @@ else fi echo $ac_n "checking for XCurses library""... $ac_c" 1>&6 -echo "configure:15879: checking for XCurses library" >&5 +echo "configure:15995: checking for XCurses library" >&5 if eval "test \"`echo '$''{'cf_cv_lib_XCurses'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else LIBS="-lXCurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 15886 "configure" +#line 16002 "configure" #include "confdefs.h" #include <xcurses.h> @@ -15892,7 +16008,7 @@ int main() { XCursesExit(); ; return 0; } EOF -if { (eval echo configure:15896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_lib_XCurses=yes else @@ -15926,7 +16042,7 @@ fi else echo $ac_n "checking if we can include termio.h with curses""... $ac_c" 1>&6 -echo "configure:15930: checking if we can include termio.h with curses" >&5 +echo "configure:16046: 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 @@ -15935,7 +16051,7 @@ else CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H -I. -I${srcdir-.} -I${srcdir-.}/src -I${srcdir-.}/WWW/Library/Implementation" touch lynx_cfg.h cat > conftest.$ac_ext <<EOF -#line 15939 "configure" +#line 16055 "configure" #include "confdefs.h" #include <LYCurses.h> @@ -15944,7 +16060,7 @@ int main() { putchar(0x0a) ; return 0; } EOF -if { (eval echo configure:15948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16064: \"$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 08097dd2..9b5be075 100644 --- a/configure.in +++ b/configure.in @@ -4,12 +4,10 @@ dnl by T.E.Dickey <dickey@invisible-island.net> dnl and Jim Spath <jspath@mail.bcpl.lib.md.us> AC_PREREQ(2.12.971222) -rm -f config.cache - AC_INIT(userdefs.h) +rm -f config.cache; touch config.cache CONFIG_H=lynx_cfg.h AC_CONFIG_HEADER($CONFIG_H:config.hin) - CF_CHECK_CACHE PACKAGE=lynx @@ -554,7 +552,6 @@ AC_CHECK_FUNCS( \ getgroups \ gettimeofday \ getuid \ - mkstemp \ mktemp \ popen \ putenv \ @@ -572,6 +569,7 @@ AC_REPLACE_FUNCS( \ strstr \ ) +CF_MKSTEMP CF_SRAND(lynx_) CF_CHECK_FUNCDECLS([#include <string.h>], strstr) CF_CHECK_FUNCDECLS([ diff --git a/lynx.cfg b/lynx.cfg index 64e8a113..648e5973 100644 --- a/lynx.cfg +++ b/lynx.cfg @@ -1419,18 +1419,28 @@ DEFAULT_INDEX_FILE:http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/MetaIndex.html .h2 DEFAULT_KEYPAD_MODE # DEFAULT_KEYPAD_MODE may be set to NUMBERS_AS_ARROWS +# or LINKS_ARE_NOT_NUMBERED (the same) # or LINKS_ARE_NUMBERED # or LINKS_AND_FIELDS_ARE_NUMBERED -# to specify whether numbers (e.g. [10]) appear before all links, +# or FIELDS_ARE_NUMBERED +# to specify whether numbers (e.g. [10]) appear next to all links, # allowing immediate access by entering the number on the keyboard, # or numbers on the numeric key-pad work like arrows; -# the 3rd option causes form fields also to be preceded by numbers. -# The first two options (but not the last) can be changed in lynx.cfg -# and all three can be changed via the Options Menu. +# the "FIELDS" options cause form fields also to be numbered. +# This may be overridden by the keypad_mode setting in .lynxrc, +# and can also be changed via the Options Menu. # #DEFAULT_KEYPAD_MODE:NUMBERS_AS_ARROWS +.h2 NUMBER_LINKS_ON_LEFT +.h2 NUMBER_FIELDS_ON_LEFT +# Denotes the position for link- and field-numbers (whether it is on the left +# or right of the anchor). These are subject to DEFAULT_KEYPAD_MODE, which +# determines whether numbers are shown. +#NUMBER_LINKS_ON_LEFT:TRUE +#NUMBER_FIELDS_ON_LEFT:TRUE + .h2 DEFAULT_KEYPAD_MODE_IS_NUMBERS_AS_ARROWS # Obsolete form of DEFAULT_KEYPAD_MODE, # numbers work like arrows or numbered links. @@ -3200,6 +3210,7 @@ COLOR:6:brightred:black #ENABLE_LYNXRC:raw_mode:OFF #ENABLE_LYNXRC:run_all_execution_links:ON #ENABLE_LYNXRC:run_execution_links_on_local_files:ON +#ENABLE_LYNXRC:scrollbar:OFF #ENABLE_LYNXRC:select_popups:ON #ENABLE_LYNXRC:set_cookies:OFF #ENABLE_LYNXRC:show_color:ON diff --git a/lynx.hlp b/lynx.hlp index 843cb202..7be1400c 100644 --- a/lynx.hlp +++ b/lynx.hlp @@ -39,7 +39,7 @@ intermixed in option names (in the reference below options are with one dash before them and with underscores). - - If the argument is only '-', then Lynx expects to + - If the argument is only `-', then Lynx expects to receive the arguments from stdin. This is to allow for the potentially very long command line that can be associated with the -get_data or -post_data @@ -210,7 +210,7 @@ directory listings. -force_empty_hrefless_a - force HREF-less 'A' elements to be empty (close + force HREF-less `A' elements to be empty (close them as soon as they are seen). -force_html @@ -232,7 +232,7 @@ -get_data properly formatted data for a get form are read in from stdin and passed to the form. Input is - terminated by a line that starts with '---'. + terminated by a line that starts with `---'. -head send a HEAD request for the mime headers. @@ -253,7 +253,7 @@ ignore hidden links do not appear even in listings. -historical - toggles use of '>' or '-->' as a terminator for + toggles use of `>' or `-->' as a terminator for comments. -homepage=URL @@ -385,7 +385,7 @@ -post_data properly formatted data for a post form are read in from stdin and passed to the form. Input is - terminated by a line that starts with '---'. + terminated by a line that starts with `---'. -preparsed show HTML source preparsed and reformatted when @@ -467,7 +467,7 @@ file_url - disallow using G)oto, served links or bookmarks for file: URLs. - goto - disable the 'g' (goto) command. + goto - disable the `g' (goto) command. inside_ftp - disallow ftps for people coming from inside your domain (utmp required for selectivity). @@ -484,7 +484,7 @@ from inside your domain (utmp required for selectivity). - jump - disable the 'j' (jump) command. + jump - disable the `j' (jump) command. multibook - disallow multiple bookmarks. mail - disallow mail. @@ -568,7 +568,7 @@ -soft_dquotes toggles emulation of the old Netscape and Mosaic - bug which treated '>' as a co-terminator for + bug which treated `>' as a co-terminator for double-quotes and tags. -source @@ -620,6 +620,7 @@ 1=SGML character parsing states 2=color-style 4=TRST (table layout) + 8=config (lynx.cfg and .lynxrc contents) -traversal traverse all http links derived from startfile. @@ -675,7 +676,7 @@ -with_backspaces emit backspaces in output if -dumping or -crawling - (like 'man' does) + (like `man' does) 2 Commands o Use Up arrow and Down arrow to scroll through hypertext @@ -792,7 +793,7 @@ be "http", "ftp", "gopher" or "wais"), however most gateway servers have been discontinued. Note that you do not - include a terminal '/' for gateways, + include a terminal `/' for gateways, but do for proxies specified by PROTOCOL_proxy environment variables. See Lynx Users Guide for details. diff --git a/lynx.man b/lynx.man index 04bfe6dc..4e54e019 100644 --- a/lynx.man +++ b/lynx.man @@ -654,6 +654,8 @@ Logically OR the values to combine options: 2=color-style .br 4=TRST (table layout) +.br +8=config (lynx.cfg and .lynxrc contents) .TP .B -traversal traverse all http links derived from startfile. When used with diff --git a/lynx_help/Lynx_users_guide.html b/lynx_help/Lynx_users_guide.html index 64d84119..73a08910 100644 --- a/lynx_help/Lynx_users_guide.html +++ b/lynx_help/Lynx_users_guide.html @@ -831,7 +831,7 @@ return to Lynx or the '<em>></em>' command to save the options to a to distinguish the current link or OPTION from the others in the screen display. - <dt>Keypad as arrows, numbered links, or numbered links and form fields + <dt>Keypad as arrows, numbered links, numbered fields, or numbered links and form fields <dd>This option gives the choice among navigating with the arrow keys, or having every link numbered so that the links may be selected or made current by numbers as well as using the arrow diff --git a/lynx_help/keystrokes/follow_help.html b/lynx_help/keystrokes/follow_help.html index b5893963..901c0af8 100644 --- a/lynx_help/keystrokes/follow_help.html +++ b/lynx_help/keystrokes/follow_help.html @@ -8,9 +8,11 @@ <h1>+++ Follow link (or goto link or page) number Help +++<br> +++ Select option (or page) number Help +++</h1> -If a user has set <em>Keypad mode</em> to <em>Links are numbered</em> -or <em>Links and form fields are numbered</em> as the default or for -the current session via the <em>Options menu</em>, then hypertext links +If a user has set <em>Keypad mode</em> to <em>Links are numbered</em>, +or <em>Form fields are numbered</em>, +or <em>Links and form fields are numbered</em> +as the default or for the current session via the <em>Options menu</em>, +then hypertext links (and form fields, depending on the keypad mode) are prefixed with numbers in square brackets. Entering a keyboard or keypad number is treated as an <em>F_LINK_NUM</em> command, and should @@ -23,8 +25,10 @@ the document for that link as if you had paged or used other navigation commands to make it the current link and then ACTIVATE-ed it. The prompt can be invoked via '<em>0</em>', but it will not be treated as the lead digit for the number entry, whereas '<em>1</em>' through '<em>9</em>' both -invoke the prompt and are treated as the first digit. In <em>Links and -form fields are numbered</em> mode, if the number corresponds to a form +invoke the prompt and are treated as the first digit. +In <em>Form fields are numbered</em> +or <em>Links and form fields are numbered</em> mode, +if the number corresponds to a form field you will be positioned on that field, but if it is a submit button it will not be ACTIVATE-ed. @@ -32,8 +36,9 @@ it will not be ACTIVATE-ed. <em>123g</em>), then Lynx will make the link corresponding to that number the current link, paging as appropriate if the link does not appear in the currently displayed page. The '<em>g</em>' suffix is inferred (need -not be entered) for form fields in <em>Links and form fields are -numbered</em> mode. +not be entered) for form fields in +<em>Form fields are numbered</em> or +<em>Links and form fields are numbered</em> mode. <p>Alternatively, if the number is given a '<em>p</em>' suffix (e.g., <em>123p</em>), Lynx will make the page corresponding to that number @@ -72,8 +77,10 @@ then only '<em>0</em>', rather than every number, will be treated as an number:</em> prompt. The '<em>0</em>' will not be treated as the first digit for the number, or number plus suffix, entry. -<p>Numbers are associated with form fields only when <em>Links and form -fields are numbered</em> mode has been selected. If you have selected +<p>Numbers are associated with form fields only when +<em>Form fields are numbered</em> or +<em>Links and form fields are numbered</em> mode has been selected. +If you have selected <em>Numbers act as arrows</em> or <em>Links are numbered</em> mode, you can seek form fields in the document via WHEREIS searches for strings in their displayed values. If they are INPUT or TEXTAREA fields with no @@ -83,8 +90,10 @@ displayed document. <p ID="select-option">When you have invoked a popup window for a list of OPTIONs in a form's SELECT block, each OPTION is associated with a number, -and that number will be displayed in <em>Links and form fields are -numbered</em> mode. In any keypad mode, the <em>F_LINK_NUM</em> +and that number will be displayed in +<em>Form fields are numbered</em> or +<em>Links and form fields are numbered</em> mode. +In any keypad mode, the <em>F_LINK_NUM</em> ('<em>0</em>') command will invoke a <em>Select option (or page) number:</em> prompt, and you can enter a number, and optionally a '<em>g</em>' or '<em>p</em>' suffix, to select or seek an OPTION in that @@ -106,6 +115,7 @@ while viewing a popup window, the user can type to skip ahead 3 pages, and <em>50g-</em> will move the current selection back 50 options. This will work whether or not <em>keypad mode</em> is +<em>Form fields are numbered</em> or <em>Links and form fields are numbered</em> since options are numbered internally. If form field numbering is turned off, the option numbers won't appear on screen, @@ -159,6 +169,7 @@ a name/value pair for the fields should be included in the content submitted for the form, but the value should not be displayed in the rendered form. Lynx respects this attribute as well, and neither displays the HIDDEN field, nor assigns it a number for the F_LINK_NUM ('<em>0</em>') command and +<em>Form fields are numbered</em> or <em>Links and form fields are numbered</em> keypad mode handling, nor includes an entry for it in the menus created for the LIST ('<em>l</em>') or ADDRLIST ('<em>A</em>') diff --git a/lynx_help/keystrokes/keystroke_help.html b/lynx_help/keystrokes/keystroke_help.html index d3ca4ede..699d01f8 100644 --- a/lynx_help/keystrokes/keystroke_help.html +++ b/lynx_help/keystrokes/keystroke_help.html @@ -105,6 +105,14 @@ CTRL-V prompts for a key command (allows <A HREF="../Lynx_users_guide.html#CtrlVNote" >escaping</A> from the field). + + Note that on most UNIX hosts, CTRL-V is bound + via stty to the lnext (literal-next) code but + the exact behavior of that is implementation + specific. On Solaris you must type CTRL-V + twice to use it, since it quotes the following + keystroke. + CTRL-U - Erase input line (<a href="edit_help.html" >more input line commands</a>) CTRL-G - Cancel input or transfer diff --git a/lynx_help/keystrokes/scrolling_help.html b/lynx_help/keystrokes/scrolling_help.html index 71a401d7..6ddec1ed 100644 --- a/lynx_help/keystrokes/scrolling_help.html +++ b/lynx_help/keystrokes/scrolling_help.html @@ -14,7 +14,7 @@ - (or b, - If you have moved down in a document, this or CTRL-B) will bring you back up one page (Page-Up). - If the 'Num Lock' on your keyboard is on, Lynx will translate + If the 'Num Lock' on your keyboard is on, Lynx translates the numbers of your keypad into movement commands as follows: 9 - page up diff --git a/lynx_help/lynx_url_support.html b/lynx_help/lynx_url_support.html index bee82050..ac2ccbb9 100644 --- a/lynx_help/lynx_url_support.html +++ b/lynx_help/lynx_url_support.html @@ -7,21 +7,22 @@ <BODY> <blockquote> -<em>[</em><a href="#http">http, https</a> <em>|</em> -<a href="#telnet">telnet, tn3270, rlogin</a> <em>|</em> -<a href="#gopher">gopher</a> <em>|</em> -<a href="#file">file</a> <em>|</em> -<a href="#ftp">ftp</a> <em>|</em> -<a href="#wais">wais</a> <em>|</em> -<a href="#news">news, nntp, snews</a> <em>|</em> -<a href="#newspost">newspost, newsreply, snewspost, snewsreply</a> <em>|</em> -<a href="#mailto">mailto</a> <em>|</em> -<a href="#finger">finger</a> <em>|</em> -<a href="#cso">cso</a> <em>|</em> -<a href="#bibp">bibp</a> <em>|</em> -<a href="#exec">lynxexec, lynxprog</a> <em>|</em> -<a href="#cgi">lynxcgi</a><em>|</em> -<a href="#internal">internal</a><em>]</em> +<em>[</em><a href="#http_url">http, https</a> <em>|</em> +<a href="#telnet_url">telnet, tn3270, rlogin</a> <em>|</em> +<a href="#gopher_url">gopher</a> <em>|</em> +<a href="#file_url">file</a> <em>|</em> +<a href="#ftp_url">ftp</a> <em>|</em> +<a href="#wais_url">wais</a> <em>|</em> +<a href="#news_url">news, nntp, snews</a> <em>|</em> +<a href="#newspost_url">newspost, newsreply, snewspost, snewsreply</a> <em>|</em> +<a href="#mailto_url">mailto</a> <em>|</em> +<a href="#finger_url">finger</a> <em>|</em> +<a href="#cso_url">cso</a> <em>|</em> +<a href="#bibp_url">bibp</a> <em>|</em> +<a href="#exec_url">lynxexec, lynxprog</a> <em>|</em> +<a href="#cgi_url">lynxcgi</a><em>|</em> +<a href="#ncftp_url">NcFTP</a> <em>|</em> +<a href="#internal_url">internal</a><em>]</em> </blockquote> <H1><em>URL Schemes Supported in Lynx</em></H1> @@ -74,7 +75,7 @@ Any partial or relative URLs within HTML documents are resolved according to the rules specified in RFC1808 and subsequent IETF drafts. <HR> -<H2><a name="http">The <em>http</em> and <em>https</em> URLs:</a></H2> +<H2><a name="http_url">The <em>http</em> and <em>https</em> URLs:</a></H2> Lynx handles http URLs exactly as specified in RFC1738. The format is: @@ -99,7 +100,7 @@ and associated red tape pose severe impediments to inclusion of this support in the general distributions of freeware WWW clients such as Lynx. Sorry. <HR> -<H2><a name="telnet" +<H2><a name="telnet_url" >The <em>telnet</em>, <em>tn3270</em>, and <em>rlogin</em> URLs:</a></H2> A <em>telnet</em> URL generally results in Lynx spawning a telnet @@ -123,7 +124,7 @@ for most TCP-IP software you will be prompted for a password whether or not one was included in the URL. <HR> -<H2><a name="gopher">The <em>gopher</em> URL:</a></H2> +<H2><a name="gopher_url">The <em>gopher</em> URL:</a></H2> The gopher URL takes the form: <pre> @@ -172,7 +173,7 @@ listings returned by gopher servers, but should be considered Lynxisms and UMN Gopherisms. <HR> -<H2><a name="file">The <em>file</em> URL:</a></H2> +<H2><a name="file_url">The <em>file</em> URL:</a></H2> The file URL is used to retrieve files or generate a directory listing on the local host. The host field can be <em>localhost</em> or a domain @@ -206,7 +207,7 @@ use the <em>showinfo</em> command (<em>=</em>) to see the file URL which Lynx created for it. <HR> -<H2><a name="ftp">The <em>ftp</em> URL:</a></H2> +<H2><a name="ftp_url">The <em>ftp</em> URL:</a></H2> The ftp URL has the general format: <pre> @@ -267,7 +268,7 @@ tilde (<em>~</em>) as for <a href="#file">file</a> URLs, e.g.: </pre> <HR> -<H2><a name="wais">The <em>wais</em> URL:</a></H2> +<H2><a name="wais_url">The <em>wais</em> URL:</a></H2> The wais URL is used to retrieve resources using the Wide Area Information System protocol. The format is: @@ -289,7 +290,7 @@ convert the server's reply into a hit list with URLs that include the the hit list. <HR> -<H2><a name="news" +<H2><a name="news_url" >The <em>news</em>, <em>nntp</em>, and <em>snews</em> URLs:</a></H2> The news and nntp URLs are handled by Lynx as specified in RFC1738, but @@ -349,7 +350,7 @@ are specific to each nntp server, unlike the unique identifiers for news messages. <HR> -<H2><a name="newspost" +<H2><a name="newspost_url" >The <em>newspost</em>, <em>newsreply</em>, <em>snewspost</em>, and <em>snewsreply</em> URLs:</a></H2> @@ -395,7 +396,7 @@ href="#mailto">mailto</a> URLs, with the qualification that they presently are supported only by Lynx. <HR> -<H2><a name="mailto">The <em>mailto</em> URL:</a></H2> +<H2><a name="mailto_url">The <em>mailto</em> URL:</a></H2> The mailto URL is used to provide links that when activated can be used to send a comment or the content of a FORM to an Internet email @@ -483,7 +484,7 @@ and the prefixed inclusion should be trimmed by the user to just those passages relevant to the message which will be sent. <HR> -<H2><a name="finger">The <em>finger</em> URL:</a></H2> +<H2><a name="finger_url">The <em>finger</em> URL:</a></H2> Lynx has full support for the finger protocol, but a format for finger URLs has not yet been adopted by the IETF. The formats supported by Lynx @@ -517,7 +518,7 @@ Lynx will handle such URLs equivalently to overt finger URLs, including creation of links for any strings which appear to be supported URLs. <HR> -<H2><a name="cso">The <em>cso</em> URL:</a></H2> +<H2><a name="cso_url">The <em>cso</em> URL:</a></H2> The cso URL is intended to provide a gateway to CSO/PH (QI) servers. The requests are made on port 105 by default (<em>:105</em>), with the @@ -539,7 +540,7 @@ to the server. Any strings in the reports returned for these requests converted into a link for accessing that URL. <HR> -<H2><a name="bibp">The <em>bibp</em> URL:</a></H2> +<H2><a name="bibp_url">The <em>bibp</em> URL:</a></H2> <p>Lynx provides built-in support for bibliographic protocol (BibP). BibP links are links to published works such as books or journal articles, @@ -548,7 +549,7 @@ by a local bibhost server (http://bibhost/) if it exists. Otherwise, resolution is performed by a document-specified server or a known global server. -<H2><a name="exec">The <em>lynxexec</em> and <em>lynxprog</em> URLs:</a></H2> +<H2><a name="exec_url">The <em>lynxexec</em> and <em>lynxprog</em> URLs:</a></H2> If execution of spawned commands has been enabled in your Lynx image, the lynxexec and lynxprog URLs can be used to execute arbitrary system commands @@ -575,7 +576,7 @@ from the utility invoked via lynxprog. solely for Lynx. <HR> -<H2><a name="cgi">The <em>lynxcgi</em> URL:</a></H2> +<H2><a name="cgi_url">The <em>lynxcgi</em> URL:</a></H2> The lynxcgi URL is implemented only on Unix, can be used as the ACTION for a FORM, and if enabled in your Lynx image has the format: @@ -602,7 +603,19 @@ more efficient and comprehensive than any code which might be incorporated within Lynx. <HR> -<H2><a name="internal">The <em>LYNXfoo</em> internal URLs:</a></H2> +<H2><a name="ncftp_url">The <em>NcFTP</em> URL:</a></H2> + +Lynx recognizes the NcFTP-style ftp URL, e.g., +<pre> + <cite>ftpHost</cite>:<cite>fileSpecification</cite> +</pre> +for example +<pre><code> + ftp.gnu.org:/pub/gnu +</code></pre> +<HR> + +<H2><a name="internal_url">The <em>LYNXfoo</em> internal URLs:</a></H2> Lynx uses a variety of private URL schemes for communication among its internal modules. They start with uppercase letters <code>LYNX</code> diff --git a/samples/keepviewer b/samples/keepviewer new file mode 100755 index 00000000..92e8f768 --- /dev/null +++ b/samples/keepviewer @@ -0,0 +1,15 @@ +#!/bin/sh +# This script can be invoked as a wrapper for an external viewer by lynx, e.g., +# given this line in lynx.cfg +# XLOADIMAGE_COMMAND:keepviewer xli %s & +# it will invoke xli on a hardlink to the file (which is assumed to be in the +# temporary directory created by lynx), and clean up when the viewer exits. +# +# Parameters: +# $1 is viewer +# $2 is filename +chmod 600 $2 +myfile=`echo $2 | sed -e 's@\(.*/tmp/\)\([^/]*/\)\?\(.*\)@\1my\3@'` +ln $2 $myfile || exit 1 +trap "rm -f $myfile" 0 1 2 5 15 +eval $1 $myfile diff --git a/samples/lynxdump b/samples/lynxdump new file mode 100755 index 00000000..f79be2fa --- /dev/null +++ b/samples/lynxdump @@ -0,0 +1,15 @@ +#!/bin/sh +# lynx -dump w/o numbers +: ${TMPDIR-/tmp} +: ${HOME-`pwd`} +oldmask=`umask` +umask 077 +MYTMP=$TMPDIR/mytmp$$ +mkdir $MYTMP || exit 1 +trap 'cd /; rm -rf $MYTMP' 0 1 2 5 15 +if test $HOME/.lynxrc ; then + cp $HOME/.lynxrc $MYTMP/.lynxrc +fi +echo 'keypad_mode=NUMBERS_AS_ARROWS' >> $MYTMP/.lynxrc +HOME=$MYTMP; export HOME +lynx -justify -dump -force_html -with_backspaces -nolist $* diff --git a/src/GridText.c b/src/GridText.c index 8b12dd33..88630322 100644 --- a/src/GridText.c +++ b/src/GridText.c @@ -145,7 +145,7 @@ PUBLIC int LYCacheSourceForAborted = SOURCE_CACHE_FOR_ABORTED_DROP; #endif #ifdef USE_SCROLLBAR -PUBLIC BOOLEAN LYsb = FALSE; +PUBLIC BOOLEAN LYShowScrollbar = FALSE; PUBLIC BOOLEAN LYsb_arrow = TRUE; PUBLIC int LYsb_begin = -1; PUBLIC int LYsb_end = -1; @@ -1580,7 +1580,7 @@ PRIVATE void display_scrollbar ARGS1( int top_skip, bot_skip, sh, shown; LYsb_begin = LYsb_end = -1; - if (!LYsb || !text || h <= 2 + if (!LYShowScrollbar || !text || h <= 2 || (text->Lines + 1) <= display_lines) return; @@ -4014,12 +4014,32 @@ check_WrapSource: /* * Check if we should ignore characters at the wrap point. */ - if (text->IgnoreExcess && - (((indent + (int)line->offset + (int)line->size) + - (int)style->rightIndent - ctrl_chars_on_this_line) >= (WRAP_COLS(text)-1) || - ((indent + (int)line->offset + (int)line->size) + - utfxtra_on_this_line - ctrl_chars_on_this_line) >= (LYcols_cu-1))) - return; + if (text->IgnoreExcess) { + int nominal = (indent + (int)(line->offset + line->size) - ctrl_chars_on_this_line); + int limit = (WRAP_COLS(text) - 1); + int number; + + if (fields_are_numbered() + && !number_fields_on_left + && text->last_anchor != 0 + && (number = text->last_anchor->number) > 0) { + limit -= (number > 99999 + ? 6 + : (number > 9999 + ? 5 + : (number > 999 + ? 4 + : (number > 99 + ? 3 + : (number > 9 + ? 2 + : 1))))) + 2; + } + if ((nominal + (int)style->rightIndent) >= limit + || (nominal + utfxtra_on_this_line) >= (LYcols_cu - 1)) { + return; + } + } /* * Check for end of line. @@ -4769,6 +4789,33 @@ PUBLIC void HText_startStblRowGroup ARGS2( /* Anchor handling ** --------------- */ +PRIVATE void add_link_number ARGS3( + HText *, text, + TextAnchor *, a, + BOOL, save_position) +{ + char marker[32]; + + /* + * If we are doing link_numbering add the link number. + */ + if ((a->number > 0) +#ifdef USE_PRETTYSRC + && (text->source ? !psrcview_no_anchor_numbering : 1 ) +#endif + && links_are_numbered()) { + char saved_lastchar = text->LastChar; + int saved_linenum = text->Lines; + sprintf(marker,"[%d]", a->number); + HText_appendText(text, marker); + if (saved_linenum && text->Lines && saved_lastchar != ' ') + text->LastChar = ']'; /* if marker not after space caused split */ + if (save_position) { + a->line_num = text->Lines; + a->line_pos = text->last_line->size; + } + } +} /* Start an anchor field */ @@ -4777,8 +4824,6 @@ PUBLIC int HText_beginAnchor ARGS3( BOOL, underline, HTChildAnchor *, anc) { - char marker[32]; - TextAnchor * a = typecalloc(TextAnchor); if (a == NULL) @@ -4812,25 +4857,8 @@ PUBLIC int HText_beginAnchor ARGS3( a->number = 0; } - /* - * If we are doing link_numbering add the link number. - */ - if ((a->number > 0) && -#ifdef USE_PRETTYSRC - (text->source ? !psrcview_no_anchor_numbering : 1 ) && -#endif - (keypad_mode == LINKS_ARE_NUMBERED || - keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED)) { - char saved_lastchar = text->LastChar; - int saved_linenum = text->Lines; - sprintf(marker,"[%d]", a->number); - HText_appendText(text, marker); - if (saved_linenum && text->Lines && saved_lastchar != ' ') - text->LastChar = ']'; /* if marker not after space caused split */ - a->line_num = text->Lines; - a->line_pos = text->last_line->size; - } - + if (number_links_on_left) + add_link_number(text, a, TRUE); return(a->number); } @@ -4881,14 +4909,14 @@ PRIVATE BOOL HText_endAnchor0 ARGS3( "BUG: HText_endAnchor0: internal error: last anchor was input field!\n")); return FALSE; } + if (a->number) { /* * If it goes somewhere... */ int i, j, k, l; BOOL remove_numbers_on_empty = (BOOL) ( - ((keypad_mode == LINKS_ARE_NUMBERED || - keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED) && + (links_are_numbered() && (text->hiddenlinkflag != HIDDENLINKS_MERGE || (LYNoISMAPifUSEMAP && !(text->node_anchor && text->node_anchor->bookmark) && @@ -5117,7 +5145,7 @@ PRIVATE BOOL HText_endAnchor0 ARGS3( for (anc = a; anc; anc = anc->next) { if (anc->line_num == a->line_num && anc->line_pos >= NumSize) { - anc->line_pos -= NumSize; + anc->line_pos -= NumSize; } } start->size = j; @@ -5246,6 +5274,8 @@ PRIVATE BOOL HText_endAnchor0 ARGS3( } } } else { + if (!number_links_on_left) + add_link_number(text, a, FALSE); /* * The anchor's content is not restricted to only * white and special characters, so we'll show it @@ -7506,8 +7536,7 @@ PUBLIC void print_crawl_to_fd ARGS3( * Add the References list if appropriate */ if ((nolist == FALSE) && - (keypad_mode == LINKS_ARE_NUMBERED || - keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED)) { + links_are_numbered()) { printlist(fp,FALSE); } @@ -8811,7 +8840,7 @@ PRIVATE char * HText_skipOptionNumPrefix ARGS1( /* * Check if we are in the correct keypad mode. */ - if (keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED) { + if (fields_are_numbered()) { /* * Skip the option number embedded in the option name so the * extra chars won't mess up cgi scripts processing the value. @@ -8869,14 +8898,16 @@ PUBLIC char * HText_setLastOptionValue ARGS7( unsigned char *tmp = NULL; int number = 0, i, j; - if (!(text && text->last_anchor && - text->last_anchor->link_type == INPUT_ANCHOR)) { + if (!(value + && text + && text->last_anchor + && text->last_anchor->link_type == INPUT_ANCHOR)) { CTRACE((tfp, "HText_setLastOptionValue: invalid call! value:%s!\n", (value ? value : "<NULL>"))); return NULL; } - CTRACE((tfp, "Entering HText_setLastOptionValue: value:%s, checked:%s\n", + CTRACE((tfp, "Entering HText_setLastOptionValue: value:\"%s\", checked:%s\n", value, (checked ? "on" : "off"))); /* @@ -8899,7 +8930,7 @@ PUBLIC char * HText_setLastOptionValue ARGS7( cp++; if (HTCurSelectGroupType == F_RADIO_TYPE && LYSelectPopups && - keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED) { + fields_are_numbered()) { /* * Collapse any space between the popup option * prefix and actual value. - FM @@ -9100,7 +9131,7 @@ PUBLIC char * HText_setLastOptionValue ARGS7( } if (TRACE) { - CTRACE((tfp, "HText_setLastOptionValue:%s value=%s", + CTRACE((tfp, "HText_setLastOptionValue:%s value=\"%s\"\n", (order == LAST_ORDER) ? " LAST_ORDER" : "", value)); CTRACE((tfp," val_cs=%d \"%s\"", @@ -9108,7 +9139,7 @@ PUBLIC char * HText_setLastOptionValue ARGS7( (val_cs >= 0 ? LYCharSet_UC[val_cs].MIMEname : "<UNKNOWN>"))); if (submit_value) { - CTRACE((tfp, " (submit_val_cs %d \"%s\") submit_value%s=%s\n", + CTRACE((tfp, " (submit_val_cs %d \"%s\") submit_value%s=\"%s\"\n", submit_val_cs, (submit_val_cs >= 0 ? LYCharSet_UC[submit_val_cs].MIMEname : "<UNKNOWN>"), @@ -9139,6 +9170,9 @@ PUBLIC int HText_beginInput ARGS3( char *IValue = NULL; unsigned char *tmp = NULL; int i, j; + int adjust_marker = 0; + int MaximumSize; + char marker[16]; CTRACE((tfp, "GridText: Entering HText_beginInput\n")); @@ -9149,7 +9183,6 @@ PUBLIC int HText_beginInput ARGS3( a->line_num = text->Lines; a->line_pos = text->last_line->size; - /* * If this is a radio button, or an OPTION we're converting * to a radio button, and it's the first with this name, make @@ -9209,7 +9242,6 @@ PUBLIC int HText_beginInput ARGS3( HTFormFields++; - /* * Set the no_cache flag if the METHOD is POST. - FM */ @@ -9486,37 +9518,34 @@ PUBLIC int HText_beginInput ARGS3( break; default: - if (keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED) + if (fields_are_numbered()) a->number = ++(text->last_anchor_number); else a->number = 0; break; } - if (keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED && a->number > 0) { - char marker[16]; + if (fields_are_numbered() && (a->number > 0)) { + sprintf(marker,"[%d]", a->number); + if (number_fields_on_left) { + BOOL had_bracket = (f->type == F_OPTION_LIST_TYPE); - if (f->type != F_OPTION_LIST_TYPE) - /* - * '[' was already put out for a popup menu - * designator. See HTML.c. - */ - HText_appendCharacter(text, '['); - sprintf(marker,"%d]", a->number); - HText_appendText(text, marker); - if (f->type == F_OPTION_LIST_TYPE) - /* - * Add option list designation char. - */ - HText_appendCharacter(text, '['); + HText_appendText(text, had_bracket ? (marker + 1) : marker); + if (had_bracket) + HText_appendCharacter(text, '['); + } else { + adjust_marker = strlen(marker); + } a->line_num = text->Lines; a->line_pos = text->last_line->size; + } else { + *marker = '\0'; } /* * Restrict SIZE to maximum allowable size. */ + MaximumSize = WRAP_COLS(text) - adjust_marker; switch (f->type) { - int MaximumSize; case F_SUBMIT_TYPE: case F_IMAGE_SUBMIT_TYPE: @@ -9532,20 +9561,19 @@ PUBLIC int HText_beginInput ARGS3( * text entry lines can be long, and will be scrolled * horizontally within the editing window. - FM */ - MaximumSize = (WRAP_COLS(text) - 1) - - (int)text->style->leftIndent - - (int)text->style->rightIndent; + MaximumSize -= (1 + + (int)text->style->leftIndent + + (int)text->style->rightIndent); /* If we are numbering form links, place is taken by [nn] */ - if (keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED) - MaximumSize -= (a->number >= 10 /*Buggy if 1e6 links, sowhat?*/ - ? (a->number >= 100 - ? (a->number >= 1000 - ? (a->number >= 10000 - ? (a->number >= 100000 - ? 6 : 5) : 4) : 3) : 2) : 1) + 2; - if (f->size > MaximumSize) - f->size = MaximumSize; + if (fields_are_numbered()) { + if (!number_fields_on_left + && f->type == F_TEXT_TYPE + && MaximumSize > a->line_pos + 10) + MaximumSize -= a->line_pos; + else + MaximumSize -= strlen(marker); + } /* * Save value for submit/reset buttons so they @@ -9554,7 +9582,6 @@ PUBLIC int HText_beginInput ARGS3( I->value = f->value; break; - default: /* * For all other fields we limit the size element to @@ -9562,10 +9589,11 @@ PUBLIC int HText_beginInput ARGS3( * are types with small placeholders, and/or are a * type which is handled via a popup window. - FM */ - if (f->size > WRAP_COLS(text)-10) - f->size = WRAP_COLS(text)-10; /* maximum */ + MaximumSize -= 10; break; } + if (f->size > MaximumSize) + f->size = MaximumSize; /* * Add this anchor to the anchor list @@ -9618,6 +9646,26 @@ PUBLIC int HText_beginInput ARGS3( } /* + * If we're numbering fields on the right, do it. Note that some fields may + * be too long for the line - we'll lose the marker in that case rather than + * truncate the field. + */ +PUBLIC void HText_endInput ARGS1( + HText *, text) +{ + if (fields_are_numbered() + && !number_fields_on_left + && text != NULL + && text->last_anchor != NULL + && text->last_anchor->number > 0) { + char marker[20]; + HText_setIgnoreExcess(text, FALSE); + sprintf(marker,"[%d]", text->last_anchor->number); + HText_appendText(text, marker); + } +} + +/* * Get a translation (properly: transcoding) quality, factoring in * our ability to translate (an UCTQ_t) and a possible q parameter * on the given charset string, for cs_from -> givenmime. @@ -11720,7 +11768,7 @@ PRIVATE void insert_new_textarea_anchor ARGS2( l->styles = htline->styles; #endif strcpy (l->data, htline->data); - if (keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED) { + if (fields_are_numbered()) { a->number++; increment_tagged_htline (l, a, &lx, &curr_tag, 1, CHOP); } @@ -11791,7 +11839,7 @@ PRIVATE void update_subsequent_anchors ARGS4( */ anchor = start_anchor->next; /* begin updating with the NEXT anchor */ while (anchor) { - if ((keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED) && + if (fields_are_numbered() && (anchor->number != 0)) anchor->number += newlines; anchor->line_num += newlines; @@ -11828,7 +11876,7 @@ PRIVATE void update_subsequent_anchors ARGS4( * relocating an anchor to the following line, when [tag] digits * expansion pushes things too far in that direction.] */ - if (keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED) { + if (fields_are_numbered()) { anchor = start_anchor->next; while (htline != FirstHTLine(HTMainText)) { diff --git a/src/GridText.h b/src/GridText.h index 24be45f6..0e2956a7 100644 --- a/src/GridText.h +++ b/src/GridText.h @@ -207,6 +207,8 @@ extern int HText_beginInput PARAMS(( HText * text, BOOL underline, InputFieldData *I)); +extern void HText_endInput PARAMS(( + HText * text)); extern int HText_SubmitForm PARAMS(( FormInfo * submit_item, document * doc, diff --git a/src/HTML.c b/src/HTML.c index d27f1844..64235829 100644 --- a/src/HTML.c +++ b/src/HTML.c @@ -5265,6 +5265,7 @@ PRIVATE int HTML_start_element ARGS6( * expected to follow. - FM */ HTML_put_string(me, "(_)"); + HText_endInput(me->text); chars = 0; me->in_word = YES; if (me->sp[0].tag_number != HTML_PRE && @@ -5280,6 +5281,7 @@ PRIVATE int HTML_start_element ARGS6( * expected to follow. - FM */ HTML_put_string(me, "[_]"); + HText_endInput(me->text); chars = 0; me->in_word = YES; if (me->sp[0].tag_number != HTML_PRE && @@ -5322,8 +5324,11 @@ PRIVATE int HTML_start_element ARGS6( * so output the rest of the underscore * placeholders, if any more are needed. - FM */ - for (; chars > 0; chars--) - HTML_put_character(me, '_'); + if (chars > 0) { + for (; chars > 0; chars--) + HTML_put_character(me, '_'); + HText_endInput(me->text); + } } else { if (HTCJK == JAPANESE) { kcode = HText_getKcode(me->text); @@ -5376,6 +5381,9 @@ PRIVATE int HTML_start_element ARGS6( HText_updateSpecifiedKcode(me->text, specified_kcode); } } + if (chars != 0) { + HText_endInput(me->text); + } HText_setIgnoreExcess(me->text, FALSE); FREE(ImageSrc); FREE(I_value); @@ -5539,7 +5547,7 @@ PRIVATE int HTML_start_element ARGS6( } /* - * If its not a multiple option list and select popups + * If it's not a multiple option list and select popups * are enabled, then don't use the checkbox/button method, * and don't put anything on the screen yet. */ @@ -5655,7 +5663,6 @@ PRIVATE int HTML_start_element ARGS6( me->LastOptionChecked = FALSE; me->first_option = FALSE; - if (present && present[HTML_OPTION_VALUE] && value[HTML_OPTION_VALUE]) { if (!I_value) { @@ -5682,7 +5689,7 @@ PRIVATE int HTML_start_element ARGS6( */ if (HTCurSelectGroupType == F_RADIO_TYPE && LYSelectPopups && - keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED) { + fields_are_numbered()) { char marker[8]; int opnum = HText_getOptionNum(me->text); @@ -7518,6 +7525,7 @@ End_Object: */ if (!me->first_option) { HText_appendCharacter(me->text, ']'); + HText_endInput(me->text); HText_setLastChar(me->text, ']'); me->in_word = YES; } diff --git a/src/LYCurses.c b/src/LYCurses.c index 7d664bfa..2f43537b 100644 --- a/src/LYCurses.c +++ b/src/LYCurses.c @@ -1515,6 +1515,39 @@ PUBLIC void LYpaddstr ARGS3( while (width-- > 0) waddstr(the_window, " "); } + +/* + * Workaround a bug in ncurses order-of-refresh by setting a pointer to + * the topmost window that should be displayed. + * + * FIXME: the associated call on 'keypad()' is not needed for Unix, but + * something in the OS/2 EMX port requires it. + */ +PRIVATE WINDOW *my_subwindow; + +PUBLIC void LYsubwindow ARGS1(WINDOW *, param) +{ + if (param != 0) { + my_subwindow = param; +#if defined(NCURSES) || defined(PDCURSES) + keypad(my_subwindow, TRUE); +#if defined(HAVE_GETBKGD) /* not defined in ncurses 1.8.7 */ + wbkgd(my_subwindow, getbkgd(LYwin)); + wbkgdset(my_subwindow, getbkgd(LYwin)); +#endif +#endif + scrollok(my_subwindow, TRUE); + } else { + touchwin(LYwin); + delwin(my_subwindow); + my_subwindow = 0; + } +} + +PUBLIC WINDOW *LYtopwindow NOARGS +{ + return (my_subwindow ? my_subwindow : LYwin); +} #endif PUBLIC WINDOW *LYstartPopup ARGS4( @@ -1595,7 +1628,7 @@ PUBLIC void LYstopTargetEmphasis NOARGS PUBLIC void LYtouchline ARGS1( int, row) { -#if defined(HAVE_WREDRAWLN) +#if defined(HAVE_WREDRAWLN) && !defined(NCURSES_VERSION) wredrawln(LYwin, row, 1); #else #if defined(HAVE_TOUCHLINE) @@ -2206,6 +2239,15 @@ PUBLIC void LYrefresh NOARGS wnoutrefresh(stdscr); pnoutrefresh(LYwin, 0, LYshiftWin, 0, 0, LYlines, LYscreenWidth()-1); + + /* + * Keep a popup window visible. This can happen if the user presses + * '/' to do a search within a popup. + */ + if (my_subwindow != 0) { + touchwin(my_subwindow); + wnoutrefresh(my_subwindow); + } doupdate(); } else { refresh(); diff --git a/src/LYCurses.h b/src/LYCurses.h index 03ef3b36..5de3fc6b 100644 --- a/src/LYCurses.h +++ b/src/LYCurses.h @@ -252,8 +252,10 @@ typedef struct { #ifdef USE_SLANG #define LYstopPopup() /* nothing */ +#define LYtopwindow() LYwin #else extern void LYsubwindow PARAMS((WINDOW * param)); +extern WINDOW * LYtopwindow NOPARAMS; #define LYstopPopup() LYsubwindow(0) #endif /* NCURSES */ diff --git a/src/LYGetFile.c b/src/LYGetFile.c index 3ea3e2b9..1c4097ea 100644 --- a/src/LYGetFile.c +++ b/src/LYGetFile.c @@ -716,7 +716,9 @@ Try_Redirected_URL: } { - if (url_type == FTP_URL_TYPE && !ftp_ok) { + if (!ftp_ok + && (url_type == FTP_URL_TYPE + || url_type == NCFTP_URL_TYPE)) { HTUserMsg(FTP_DISABLED); return(NULLFILE); } @@ -752,6 +754,7 @@ Try_Redirected_URL: if (url_type == HTTP_URL_TYPE || url_type == HTTPS_URL_TYPE || url_type == FTP_URL_TYPE || + url_type == NCFTP_URL_TYPE || url_type == CSO_URL_TYPE) fix_httplike_urls(doc, url_type); WWWDoc.address = doc->address; /* possible reload */ @@ -899,7 +902,8 @@ Try_Redirected_URL: (no_goto_finger && url_type == FINGER_URL_TYPE) || (no_goto_ftp && - url_type == FTP_URL_TYPE) || + (url_type == FTP_URL_TYPE || + url_type == NCFTP_URL_TYPE)) || (no_goto_gopher && url_type == GOPHER_URL_TYPE) || (no_goto_http && @@ -1552,6 +1556,20 @@ PRIVATE int fix_httplike_urls ARGS2( LYTrimHtmlSep(doc->address); CTRACE((tfp, " changed to '%s'\n", doc->address)); CTRACE_SLEEP(MessageSecs); + } else if (type == NCFTP_URL_TYPE) { + char *path = NULL; + char *first = doc->address; + char *second = strchr(first, ':'); + + CTRACE((tfp, "fix_httplike_urls: URL '%s'\n", doc->address)); + + *second++ = '\0'; + HTSprintf0(&path, "ftp://%s%s", first, second); + FREE(doc->address); + doc->address = path; + + CTRACE((tfp, " changed to '%s'\n", doc->address)); + CTRACE_SLEEP(MessageSecs); } #endif /* DISABLE_FTP */ @@ -1565,12 +1583,12 @@ PRIVATE int fix_httplike_urls ARGS2( if (type == HTTP_URL_TYPE || type == HTTPS_URL_TYPE) { if ((slash-2) - strchr(doc->address, ':')) { - /* - * Turns out we were not looking at the right slash after all, - * there must have been more than one "://" which is valid - * at least for http URLs (later occurrences can be part of - * a query string, for example), so leave this alone, too. - kw - */ + /* + * Turns out we were not looking at the right slash after all, + * there must have been more than one "://" which is valid + * at least for http URLs (later occurrences can be part of + * a query string, for example), so leave this alone, too. - kw + */ return(0); } if (strchr(doc->address, '?')) { diff --git a/src/LYGlobalDefs.h b/src/LYGlobalDefs.h index a800b37f..764b6033 100644 --- a/src/LYGlobalDefs.h +++ b/src/LYGlobalDefs.h @@ -96,6 +96,15 @@ extern char *LYCgiDocumentRoot; /* DOCUMENT_ROOT in the lynxcgi env */ #define NUMBERS_AS_ARROWS 0 #define LINKS_ARE_NUMBERED 1 #define LINKS_AND_FIELDS_ARE_NUMBERED 2 +#define FIELDS_ARE_NUMBERED 3 + +#define links_are_numbered() \ + (keypad_mode == LINKS_ARE_NUMBERED || \ + keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED) + +#define fields_are_numbered() \ + (keypad_mode == FIELDS_ARE_NUMBERED || \ + keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED) #define HIDDENLINKS_MERGE 0 #define HIDDENLINKS_SEPARATE 1 @@ -185,6 +194,8 @@ extern BOOLEAN long_url_ok; extern BOOLEAN lynx_mode; extern BOOLEAN more; /* is there more document to display? */ extern BOOLEAN news_ok; +extern BOOLEAN number_fields_on_left; +extern BOOLEAN number_links_on_left; extern BOOLEAN recent_sizechange; extern BOOLEAN rlogin_ok; extern BOOLEAN system_editor; /* True if locked-down editor */ @@ -523,7 +534,7 @@ extern int setmode(int handle, int amode); #ifdef USE_SCROLLBAR /* GridText.c */ -extern BOOLEAN LYsb; +extern BOOLEAN LYShowScrollbar; extern BOOLEAN LYsb_arrow; extern int LYsb_begin; extern int LYsb_end; diff --git a/src/LYList.c b/src/LYList.c index fcc1ad74..1606a3af 100644 --- a/src/LYList.c +++ b/src/LYList.c @@ -123,7 +123,7 @@ PUBLIC int showlist ARGS2( * right in connection with always treating this file as * HIDDENLINKS_MERGE in GridText.c - kw */ - if (keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED) { + if (fields_are_numbered()) { HText_FormDescNumber(cnt, (char **)&desc); fprintf(fp0, "<li><a id=%d href=\"#%d\">form field</a> = <em>%s</em>\n", @@ -286,7 +286,7 @@ PUBLIC void printlist ARGS2( * the list page match the numbering in the original document, * but won't create a forward link to the form. - FM && LE */ - if (keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED) { + if (fields_are_numbered()) { HText_FormDescNumber(cnt, (char **)&desc); fprintf(fp, "%4d. form field = %s\n", cnt, desc); } diff --git a/src/LYMain.c b/src/LYMain.c index 689be99d..36303f4c 100644 --- a/src/LYMain.c +++ b/src/LYMain.c @@ -154,49 +154,54 @@ PUBLIC lynx_list_item_type *downloaders = NULL; PUBLIC lynx_list_item_type *externals = NULL; /* linked list of external options */ #endif + PUBLIC lynx_list_item_type *uploaders = NULL; PUBLIC int port_syntax = 1; PUBLIC int LYShowColor = SHOW_COLOR_UNKNOWN; /* to show or not */ PUBLIC int LYrcShowColor = SHOW_COLOR_UNKNOWN; /* ... last used */ + #if !defined(NO_OPTION_FORMS) && !defined(NO_OPTION_MENU) PUBLIC BOOLEAN LYUseFormsOptions = TRUE; /* use forms-based options menu */ #endif + +PUBLIC BOOLEAN LYJumpFileURL = FALSE; /* always FALSE the first time */ +PUBLIC BOOLEAN LYPermitURL = FALSE; +PUBLIC BOOLEAN LYRestricted = FALSE; /* whether we have -anonymous option */ PUBLIC BOOLEAN LYShowCursor = SHOW_CURSOR; /* to show or not to show */ -PUBLIC BOOLEAN verbose_img = VERBOSE_IMAGES; /* show filenames or not */ PUBLIC BOOLEAN LYUseDefShoCur = TRUE; /* Command line -show_cursor toggle */ +PUBLIC BOOLEAN LYUserSpecifiedURL = TRUE;/* always TRUE the first time */ +PUBLIC BOOLEAN LYValidate = FALSE; PUBLIC BOOLEAN LYforce_no_cache = FALSE; -PUBLIC BOOLEAN LYoverride_no_cache = FALSE;/*override no-cache b/c history etc*/ PUBLIC BOOLEAN LYinternal_flag = FALSE; /* override no-cache b/c internal link*/ +PUBLIC BOOLEAN LYoverride_no_cache = FALSE;/*override no-cache b/c history etc*/ PUBLIC BOOLEAN LYresubmit_posts = ALWAYS_RESUBMIT_POSTS; PUBLIC BOOLEAN LYtrimInputFields = FALSE; -PUBLIC BOOLEAN LYUserSpecifiedURL = TRUE;/* always TRUE the first time */ -PUBLIC BOOLEAN LYJumpFileURL = FALSE; /* always FALSE the first time */ -PUBLIC BOOLEAN jump_buffer = JUMPBUFFER; /* TRUE if offering default shortcut */ -PUBLIC BOOLEAN goto_buffer = GOTOBUFFER; /* TRUE if offering default goto URL */ -PUBLIC BOOLEAN ftp_passive = FTP_PASSIVE; /* TRUE if doing ftp in passive mode */ -PUBLIC BOOLEAN recent_sizechange = FALSE;/* the window size changed recently? */ -PUBLIC int user_mode = NOVICE_MODE; -PUBLIC BOOLEAN dump_output_immediately = FALSE; -PUBLIC BOOLEAN is_www_index = FALSE; -PUBLIC BOOLEAN lynx_mode = NORMAL_LYNX_MODE; -PUBLIC BOOLEAN bold_headers = FALSE; PUBLIC BOOLEAN bold_H1 = FALSE; +PUBLIC BOOLEAN bold_headers = FALSE; PUBLIC BOOLEAN bold_name_anchors = FALSE; -PUBLIC BOOLEAN use_underscore = SUBSTITUTE_UNDERSCORES; -PUBLIC BOOLEAN nolist = FALSE; +PUBLIC BOOLEAN case_sensitive = CASE_SENSITIVE_ALWAYS_ON; +PUBLIC BOOLEAN check_mail = CHECKMAIL; +PUBLIC BOOLEAN child_lynx = FALSE; +PUBLIC BOOLEAN dump_output_immediately = FALSE; +PUBLIC BOOLEAN emacs_keys = EMACS_KEYS_ALWAYS_ON; +PUBLIC BOOLEAN error_logging = MAIL_SYSTEM_ERROR_LOGGING; +PUBLIC BOOLEAN ftp_passive = FTP_PASSIVE; /* TRUE if doing ftp in passive mode */ +PUBLIC BOOLEAN goto_buffer = GOTOBUFFER; /* TRUE if offering default goto URL */ PUBLIC BOOLEAN historical_comments = FALSE; +PUBLIC BOOLEAN is_www_index = FALSE; +PUBLIC BOOLEAN jump_buffer = JUMPBUFFER; /* TRUE if offering default shortcut */ +PUBLIC BOOLEAN lynx_mode = NORMAL_LYNX_MODE; PUBLIC BOOLEAN minimal_comments = FALSE; +PUBLIC BOOLEAN nolist = FALSE; +PUBLIC BOOLEAN number_fields_on_left = TRUE; +PUBLIC BOOLEAN number_links_on_left = TRUE; +PUBLIC BOOLEAN recent_sizechange = FALSE;/* the window size changed recently? */ PUBLIC BOOLEAN soft_dquotes = FALSE; -PUBLIC BOOLEAN LYRestricted = FALSE; /* whether we have -anonymous option */ -PUBLIC BOOLEAN LYValidate = FALSE; -PUBLIC BOOLEAN LYPermitURL = FALSE; -PUBLIC BOOLEAN child_lynx = FALSE; -PUBLIC BOOLEAN error_logging = MAIL_SYSTEM_ERROR_LOGGING; -PUBLIC BOOLEAN check_mail = CHECKMAIL; +PUBLIC BOOLEAN use_underscore = SUBSTITUTE_UNDERSCORES; +PUBLIC BOOLEAN verbose_img = VERBOSE_IMAGES; /* show filenames or not */ 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 case_sensitive = CASE_SENSITIVE_ALWAYS_ON; +PUBLIC int user_mode = NOVICE_MODE; PUBLIC BOOLEAN telnet_ok = TRUE; #ifndef DISABLE_NEWS @@ -1757,7 +1762,7 @@ PUBLIC int main ARGS2( } } - if (keypad_mode == NUMBERS_AS_ARROWS) { + if (!links_are_numbered()) { if (number_fields) keypad_mode = LINKS_AND_FIELDS_ARE_NUMBERED; if (number_links) @@ -2018,7 +2023,7 @@ PUBLIC int main ARGS2( if (crawl && !number_links && !number_fields) { keypad_mode = NUMBERS_AS_ARROWS; } else if (!nolist) { - if (keypad_mode == NUMBERS_AS_ARROWS) { + if (!links_are_numbered()) { if (number_fields) keypad_mode = LINKS_AND_FIELDS_ARE_NUMBERED; else @@ -2035,8 +2040,7 @@ PUBLIC int main ARGS2( status = mainloop(); if (!nolist && !crawl && /* For -crawl it has already been done! */ - (keypad_mode == LINKS_ARE_NUMBERED || - keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED)) + links_are_numbered()) printlist(stdout, FALSE); #ifdef EXP_PERSISTENT_COOKIES /* @@ -3598,7 +3602,7 @@ with the PREV_DOC command or from the History List" ), #ifdef USE_SCROLLBAR PARSE_SET( - "scrollbar", 4|TOGGLE_ARG, LYsb, + "scrollbar", 4|TOGGLE_ARG, LYShowScrollbar, "toggles showing scrollbar" ), PARSE_SET( diff --git a/src/LYOptions.c b/src/LYOptions.c index 8de61b6b..eebb3f93 100644 --- a/src/LYOptions.c +++ b/src/LYOptions.c @@ -509,11 +509,13 @@ draw_options: LYmove(L_Keypad, 5); addlbl("(K)eypad mode : "); - LYaddstr((keypad_mode == NUMBERS_AS_ARROWS) ? - "Numbers act as arrows " : - ((keypad_mode == LINKS_ARE_NUMBERED) ? - "Links are numbered " : - "Links and form fields are numbered")); + LYaddstr(fields_are_numbered() && links_are_numbered() + ? "Links and form fields are numbered" + : links_are_numbered() + ? "Links are numbered " + : fields_are_numbered() + ? "Form fields are numbered " + : "Numbers act as arrows "); LYmove(L_Lineed, 5); addlbl("li(N)e edit style : "); @@ -2146,6 +2148,9 @@ static OptValues keypad_mode_values[] = { { LINKS_AND_FIELDS_ARE_NUMBERED, "Links and form fields are numbered", "links_and_forms" }, + { FIELDS_ARE_NUMBERED, + "Form fields are numbered", + "forms_numbered" }, { 0, 0, 0 }}; static char * lineedit_mode_string = "lineedit_mode"; static char * mail_address_string = "personal_mail_address"; @@ -2154,6 +2159,7 @@ static OptValues search_type_values[] = { { FALSE, "Case insensitive", "case_insensitive" }, { TRUE, "Case sensitive", "case_sensitive" }, { 0, 0, 0 }}; + #if defined(USE_SLANG) || defined(COLOR_CURSES) static char * show_color_string = "show_color"; static OptValues show_color_values[] = { @@ -2163,7 +2169,13 @@ static OptValues show_color_values[] = { { SHOW_COLOR_ALWAYS, always_string, always_string }, { 0, 0, 0 }}; #endif + static char * show_cursor_string = "show_cursor"; + +#if USE_SCROLLBAR +static char * show_scrollbar_string = "show_scrollbar"; +#endif + static char * user_mode_string = "user_mode"; static OptValues user_mode_values[] = { { NOVICE_MODE, "Novice", "Novice" }, @@ -2679,6 +2691,14 @@ PUBLIC int postoptions ARGS1( LYShowCursor = (BOOL) code; } +#ifdef USE_SCROLLBAR + /* Show Scrollbar: ON/OFF */ + if (!strcmp(data[i].tag, show_scrollbar_string) + && GetOptValues(bool_values, data[i].value, &code)) { + LYShowScrollbar = (BOOL) code; + } +#endif + /* User Mode: SELECT */ if (!strcmp(data[i].tag, user_mode_string) && GetOptValues(user_mode_values, data[i].value, &user_mode)) { @@ -3392,6 +3412,14 @@ PRIVATE int gen_options ARGS1( PutOptValues(fp0, LYShowCursor, bool_values); EndSelect(fp0); +#ifdef USE_SCROLLBAR + /* Show scrollbar: ON/OFF */ + PutLabel(fp0, gettext("Show scrollbar"), show_scrollbar_string); + BeginSelect(fp0, show_scrollbar_string); + PutOptValues(fp0, LYShowScrollbar, bool_values); + EndSelect(fp0); +#endif + /* Select Popups: ON/OFF */ PutLabel(fp0, gettext("Popups for select fields"), select_popups_string); BeginSelect(fp0, select_popups_string); diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c index 7dd55482..93a6457c 100644 --- a/src/LYReadCFG.c +++ b/src/LYReadCFG.c @@ -1393,6 +1393,8 @@ PRIVATE Config_Type Config_Table [] = PARSE_Env("nntp_proxy", 0), PARSE_ENV("nntpserver", 0), /* actually NNTPSERVER */ #endif + PARSE_SET("number_fields_on_left",number_fields_on_left), + PARSE_SET("number_links_on_left", number_links_on_left), PARSE_SET("no_dot_files", no_dotfiles), PARSE_SET("no_file_referer", no_filereferer), #ifndef VMS @@ -1436,7 +1438,7 @@ PRIVATE Config_Type Config_Table [] = PARSE_STR("save_space", lynx_save_space), PARSE_SET("scan_for_buried_news_refs", scan_for_buried_news_references), #ifdef USE_SCROLLBAR - PARSE_SET("scrollbar", LYsb), + PARSE_SET("scrollbar", LYShowScrollbar), PARSE_SET("scrollbar_arrow", LYsb_arrow), #endif PARSE_SET("seek_frag_area_in_cur", LYSeekFragAREAinCur), @@ -1708,6 +1710,7 @@ PRIVATE void do_read_cfg ARGS5( /* Significant lines are of the form KEYWORD:WHATEVER */ if ((value = strchr (name, ':')) == 0) { /* fprintf (stderr, "Bad line-- no :\n"); */ + CTRACE((tfp, "LYReadCFG: missing ':' %s\n", name)); continue; } @@ -1729,9 +1732,11 @@ PRIVATE void do_read_cfg ARGS5( *cp = 0; } + CTRACE2(TRACE_CFG, (tfp, "LYReadCFG %s:%s\n", name, value)); tbl = lookup_config(name); if (tbl->name == 0) { /* lynx ignores unknown keywords */ + CTRACE((tfp, "LYReadCFG: ignored %s:%s\n", name, value)); continue; } #ifdef SH_EX diff --git a/src/LYStrings.c b/src/LYStrings.c index 9960f626..5a3df082 100644 --- a/src/LYStrings.c +++ b/src/LYStrings.c @@ -419,7 +419,7 @@ PRIVATE int set_clicked_link ARGS4( c = LAC_TO_LKC0(LYK_PREV_PAGE); } #ifdef USE_SCROLLBAR - } else if (x == LYcols - 1 && LYsb && LYsb_begin >= 0) { + } else if (x == LYcols - 1 && LYShowScrollbar && LYsb_begin >= 0) { int h = display_lines - 2*(LYsb_arrow != 0); mouse_link = -2; @@ -700,7 +700,7 @@ PUBLIC int LYmbcsstrlen ARGS3( #endif /* USE_SLANG */ #if !defined(GetChar) && defined(NCURSES) -#define GetChar() wgetch(my_subwindow ? my_subwindow : LYwin) +#define GetChar() wgetch(LYtopwindow()) #endif #if !defined(GetChar) && defined(PDCURSES) && defined(PDC_BUILD) && PDC_BUILD >= 2401 @@ -752,37 +752,6 @@ PRIVATE int myGetChar NOARGS #endif /* HAVE_KEYPAD */ #endif /* !defined(GetChar) */ -/* - * Workaround a bug in ncurses order-of-refresh by setting a pointer to - * the topmost window that should be displayed. - * - * FIXME: the associated call on 'keypad()' is not needed for Unix, but - * something in the OS/2 EMX port requires it. - */ -#ifndef USE_SLANG -PRIVATE WINDOW *my_subwindow; - -PUBLIC void LYsubwindow ARGS1(WINDOW *, param) -{ - if (param != 0) { - my_subwindow = param; -#if defined(NCURSES) || defined(PDCURSES) - keypad(my_subwindow, TRUE); -#if defined(HAVE_GETBKGD) /* not defined in ncurses 1.8.7 */ - wbkgd(my_subwindow, getbkgd(LYwin)); - wbkgdset(my_subwindow, getbkgd(LYwin)); -#endif -#endif - scrollok(my_subwindow, TRUE); - } else { - touchwin(LYwin); - delwin(my_subwindow); - my_subwindow = 0; - } -} -#endif - - #if defined(USE_SLANG) && defined(USE_MOUSE) PRIVATE int sl_parse_mouse_event ARGS3(int *, x, int *, y, int *, button) { diff --git a/src/LYUtils.c b/src/LYUtils.c index f3bcc1e0..a743f4ad 100644 --- a/src/LYUtils.c +++ b/src/LYUtils.c @@ -2779,18 +2779,19 @@ PUBLIC int is_url ARGS1( { char *cp = filename; char *cp1; + int result = NOT_A_URL_TYPE; /* * Don't crash on an empty argument. */ if (cp == NULL || *cp == '\0') - return(0); + return(result); /* * Can't be a URL if it lacks a colon. */ if (NULL == strchr(cp, ':')) - return(0); + return(result); /* * Kill beginning spaces. @@ -2804,61 +2805,63 @@ PUBLIC int is_url ARGS1( * a colon later in the string. Also can't be * a URL if it starts with a colon. - KW */ - if (*cp == ':' || LYIsHtmlSep(*cp)) - return(0); + if (*cp == ':' || LYIsHtmlSep(*cp)) { + result = NOT_A_URL_TYPE; - if (compare_type(cp, "news:", 5)) { - return(NEWS_URL_TYPE); +#ifndef DISABLE_NEWS + } else if (compare_type(cp, "news:", 5)) { + result = NEWS_URL_TYPE; } else if (compare_type(cp, "nntp:", 5)) { - return(NNTP_URL_TYPE); + result = NNTP_URL_TYPE; } else if (compare_type(cp, "snews:", 6)) { - return(SNEWS_URL_TYPE); + result = SNEWS_URL_TYPE; } else if (compare_type(cp, "newspost:", 9)) { /* * Special Lynx type to handle news posts. */ - return(NEWSPOST_URL_TYPE); + result = NEWSPOST_URL_TYPE; } else if (compare_type(cp, "newsreply:", 10)) { /* * Special Lynx type to handle news replies (followups). */ - return(NEWSREPLY_URL_TYPE); + result = NEWSREPLY_URL_TYPE; } else if (compare_type(cp, "snewspost:", 10)) { /* * Special Lynx type to handle snews posts. */ - return(NEWSPOST_URL_TYPE); + result = NEWSPOST_URL_TYPE; } else if (compare_type(cp, "snewsreply:", 11)) { /* * Special Lynx type to handle snews replies (followups). */ - return(NEWSREPLY_URL_TYPE); + result = NEWSREPLY_URL_TYPE; +#endif } else if (compare_type(cp, "mailto:", 7)) { - return(MAILTO_URL_TYPE); + result = MAILTO_URL_TYPE; #ifndef DISABLE_BIBP } else if (compare_type(cp, "bibp:", 5)) { - return(BIBP_URL_TYPE); + result = BIBP_URL_TYPE; #endif } else if (compare_type(cp, "file:", 5)) { if (LYisLocalFile(cp)) { - return(FILE_URL_TYPE); + result = FILE_URL_TYPE; } else if (LYIsHtmlSep(cp[5]) && LYIsHtmlSep(cp[6])) { - return(FTP_URL_TYPE); + result = FTP_URL_TYPE; } else { - return(0); + result = NOT_A_URL_TYPE; } } else if (compare_type(cp, "data:", 5)) { - return(DATA_URL_TYPE); + result = DATA_URL_TYPE; } else if (compare_type(cp, "lynxexec:", 9)) { /* @@ -2866,7 +2869,7 @@ PUBLIC int is_url ARGS1( * of commands or scripts which require a pause to * read the screen upon completion. */ - return(LYNXEXEC_URL_TYPE); + result = LYNXEXEC_URL_TYPE; } else if (compare_type(cp, "lynxprog:", 9)) { /* @@ -2874,146 +2877,161 @@ PUBLIC int is_url ARGS1( * of commands, scripts or programs with do not * require a pause to read screen upon completion. */ - return(LYNXPROG_URL_TYPE); + result = LYNXPROG_URL_TYPE; } else if (compare_type(cp, "lynxcgi:", 8)) { /* * Special External Lynx type to handle cgi scripts. */ - return(LYNXCGI_URL_TYPE); + result = LYNXCGI_URL_TYPE; } else if (compare_type(cp, "LYNXPRINT:", 10)) { /* * Special Internal Lynx type. */ - return(LYNXPRINT_URL_TYPE); + result = LYNXPRINT_URL_TYPE; } else if (compare_type(cp, "LYNXOPTIONS:", 12)) { /* * Special Internal Lynx type. */ - return(LYNXOPTIONS_URL_TYPE); + result = LYNXOPTIONS_URL_TYPE; } else if (compare_type(cp, "LYNXCFG:", 8)) { /* * Special Internal Lynx type. */ - return(LYNXCFG_URL_TYPE); + result = LYNXCFG_URL_TYPE; } else if (compare_type(cp, "LYNXMESSAGES:", 13)) { /* * Special Internal Lynx type. */ - return(LYNXMESSAGES_URL_TYPE); + result = LYNXMESSAGES_URL_TYPE; } else if (compare_type(cp, "LYNXCOMPILEOPTS:", 16)) { /* * Special Internal Lynx type. */ - return(LYNXCOMPILE_OPTS_URL_TYPE); + result = LYNXCOMPILE_OPTS_URL_TYPE; } else if (compare_type(cp, "LYNXDOWNLOAD:", 13)) { /* * Special Internal Lynx type. */ - return(LYNXDOWNLOAD_URL_TYPE); + result = LYNXDOWNLOAD_URL_TYPE; } else if (compare_type(cp, "LYNXDIRED:", 10)) { /* * Special Internal Lynx type. */ - return(LYNXDIRED_URL_TYPE); + result = LYNXDIRED_URL_TYPE; } else if (compare_type(cp, "LYNXHIST:", 9)) { /* * Special Internal Lynx type. */ - return(LYNXHIST_URL_TYPE); + result = LYNXHIST_URL_TYPE; } else if (compare_type(cp, "LYNXKEYMAP:", 11)) { /* * Special Internal Lynx type. */ - return(LYNXKEYMAP_URL_TYPE); + result = LYNXKEYMAP_URL_TYPE; } else if (compare_type(cp, "LYNXIMGMAP:", 11)) { /* * Special Internal Lynx type. */ (void)is_url(&cp[11]); /* forces lower/uppercase of next part */ - return(LYNXIMGMAP_URL_TYPE); + result = LYNXIMGMAP_URL_TYPE; } else if (compare_type(cp, "LYNXCOOKIE:", 11)) { /* * Special Internal Lynx type. */ - return(LYNXCOOKIE_URL_TYPE); + result = LYNXCOOKIE_URL_TYPE; - } else if (strstr((cp+3), "://") == NULL) { + } else if (strlen(cp) >= 3 + && strstr((cp+3), "://") == NULL) { /* * If it doesn't contain "://", and it's not one of the * the above, it can't be a URL with a scheme we know, * so check if it's an unknown scheme for which proxying * has been set up. - FM */ - return(LYCheckForProxyURL(filename)); + if ((cp1 = strstr(cp, ":")) != NULL + && (cp1 - cp) > 1 /* exclude DOS-style device:/path */ + && LYisAbsPath(cp1+1)) { + result = NCFTP_URL_TYPE; + } else { + result = LYCheckForProxyURL(filename); + } } else if (compare_type(cp, "http:", 5)) { - return(HTTP_URL_TYPE); + result = HTTP_URL_TYPE; } else if (compare_type(cp, "https:", 6)) { - return(HTTPS_URL_TYPE); + result = HTTPS_URL_TYPE; +#ifndef DISABLE_GOPHER } else if (compare_type(cp, "gopher:", 7)) { - if ((cp1 = strchr(cp+11,'/')) != NULL) { + if (strlen(cp) >= 11 + && (cp1 = strchr(cp+11,'/')) != NULL) { if (TOUPPER(*(cp1+1)) == 'H' || *(cp1+1) == 'w') /* if this is a gopher html type */ - return(HTML_GOPHER_URL_TYPE); + result = HTML_GOPHER_URL_TYPE; else if (*(cp1+1) == 'T' || *(cp1+1) == '8') - return(TELNET_GOPHER_URL_TYPE); + result = TELNET_GOPHER_URL_TYPE; else if (*(cp1+1) == '7') - return(INDEX_GOPHER_URL_TYPE); + result = INDEX_GOPHER_URL_TYPE; else - return(GOPHER_URL_TYPE); + result = GOPHER_URL_TYPE; } else { - return(GOPHER_URL_TYPE); + result = GOPHER_URL_TYPE; } +#endif +#ifndef DISABLE_FTP } else if (compare_type(cp, "ftp:", 4)) { - return(FTP_URL_TYPE); + result = FTP_URL_TYPE; +#endif } else if (compare_type(cp, "wais:", 5)) { - return(WAIS_URL_TYPE); + result = WAIS_URL_TYPE; } else if (compare_type(cp, "telnet:", 7)) { - return(TELNET_URL_TYPE); + result = TELNET_URL_TYPE; } else if (compare_type(cp, "tn3270:", 7)) { - return(TN3270_URL_TYPE); + result = TN3270_URL_TYPE; } else if (compare_type(cp, "rlogin:", 7)) { - return(RLOGIN_URL_TYPE); + result = RLOGIN_URL_TYPE; } else if (compare_type(cp, "cso:", 4)) { - return(CSO_URL_TYPE); + result = CSO_URL_TYPE; +#ifndef DISABLE_FINGER } else if (compare_type(cp, "finger:", 7)) { - return(FINGER_URL_TYPE); + result = FINGER_URL_TYPE; +#endif } else if (compare_type(cp, "afs:", 4)) { - return(AFS_URL_TYPE); + result = AFS_URL_TYPE; } else if (compare_type(cp, "prospero:", 9)) { - return(PROSPERO_URL_TYPE); + result = PROSPERO_URL_TYPE; } else { /* * Check if it's an unknown scheme for which * proxying has been set up. - FM */ - return(LYCheckForProxyURL(filename)); + result = LYCheckForProxyURL(filename); } + return result; } /* @@ -3278,7 +3296,8 @@ PUBLIC BOOLEAN inlocaldomain NOARGS #endif /* LINUX */ } else { - CTRACE((tfp, "Could not get ttyname or open UTMP file %s\n", UTMP_FILE)); + CTRACE((tfp, "Could not get ttyname (returned %s) or open UTMP file %s\n", + (cp != 0) ? cp : "<null>", UTMP_FILE)); } return(FALSE); @@ -3852,7 +3871,7 @@ PRIVATE int fmt_tempname ARGS3( CONST char *, suffix) { int code; -#if defined(USE_MKSTEMP) && defined(HAVE_MKSTEMP) +#if defined(HAVE_MKSTEMP) int fd; char interim[LY_MAXPATH]; sprintf(interim, "%.*sXXXXXX", LY_MAXPATH - 8, prefix); @@ -7360,7 +7379,7 @@ PUBLIC void LYTrimPathSep ARGS1( path[len-1] = 0; } -#ifdef DOSPATH +#if defined(DOSPATH) && !defined(__DJGPP__) #define PATHSEP_STR "\\" #else #define PATHSEP_STR "/" diff --git a/src/LYUtils.h b/src/LYUtils.h index db0b6bbe..95c89eb2 100644 --- a/src/LYUtils.h +++ b/src/LYUtils.h @@ -223,6 +223,7 @@ typedef enum { HTTP_URL_TYPE, FILE_URL_TYPE, FTP_URL_TYPE, + NCFTP_URL_TYPE, WAIS_URL_TYPE, NEWS_URL_TYPE, NNTP_URL_TYPE, diff --git a/src/LYrcFile.c b/src/LYrcFile.c index 71068929..f79d8d11 100644 --- a/src/LYrcFile.c +++ b/src/LYrcFile.c @@ -47,9 +47,12 @@ PRIVATE Config_Enum tbl_file_sort[] = { }; PUBLIC Config_Enum tbl_keypad_mode[] = { + { "FIELDS_ARE_NUMBERED", FIELDS_ARE_NUMBERED }, { "LINKS_AND_FIELDS_ARE_NUMBERED", LINKS_AND_FIELDS_ARE_NUMBERED }, - { "LINKS_AND_FORM_FIELDS_ARE_NUMBERED", LINKS_AND_FIELDS_ARE_NUMBERED }, { "LINKS_ARE_NUMBERED", LINKS_ARE_NUMBERED }, + { "LINKS_ARE_NOT_NUMBERED", NUMBERS_AS_ARROWS }, + /* obsolete variations: */ + { "LINKS_AND_FORM_FIELDS_ARE_NUMBERED", LINKS_AND_FIELDS_ARE_NUMBERED }, { "NUMBERS_AS_ARROWS", NUMBERS_AS_ARROWS }, { NULL, DEFAULT_KEYPAD_MODE } }; @@ -400,6 +403,9 @@ WARNING - This is potentially dangerous. Since you may view\n\ you are viewing trusted source information.\n\ ")), #endif +#if USE_SCROLLBAR + MAYBE_SET("scrollbar", LYShowScrollbar, MSG_ENABLE_LYNXRC), +#endif PARSE_SET("select_popups", LYSelectPopups, N_("\ select_popups specifies whether the OPTIONs in a SELECT block which\n\ lacks a MULTIPLE attribute are presented as a vertical list of radio\n\ @@ -530,6 +536,9 @@ PUBLIC void read_rc ARGS1(FILE *, fp) if ((fp = fopen(rcfile, TXT_R)) == NULL) { return; } + CTRACE((tfp, "read_rc opened %s\n", rcfile)); + } else { + CTRACE((tfp, "read_rc used passed-in stream\n")); } /* @@ -551,11 +560,15 @@ PUBLIC void read_rc ARGS1(FILE *, fp) /* * Parse the "name=value" strings. */ - if ((value = strchr(name, '=')) == 0) + if ((value = strchr(name, '=')) == 0) { + CTRACE((tfp, "LYrcFile: missing '=' %s\n", name)); continue; + } *value++ = '\0'; LYTrimTrailing(name); value = LYSkipBlanks(value); + CTRACE2(TRACE_CFG, (tfp, "LYrcFile %s:%s\n", name, value)); + tbl = lookup_config(name); if (tbl->name == 0) { char *special = "multi_bookmark"; @@ -563,8 +576,10 @@ PUBLIC void read_rc ARGS1(FILE *, fp) tbl = lookup_config(special); } /* lynx ignores unknown keywords */ - if (tbl->name == 0) + if (tbl->name == 0) { + CTRACE((tfp, "LYrcFile: ignored %s=%s\n", name, value)); continue; + } } q = ParseUnionOf(tbl); diff --git a/userdefs.h b/userdefs.h index f567dd68..46a2afff 100644 --- a/userdefs.h +++ b/userdefs.h @@ -353,17 +353,6 @@ #define EXP_RAND_TEMPNAME 1 /******************************** - * Uncomment this line to use 'mkstemp()' in preference to lynx's own code - * in fmt_tempname(). Caution: on a few older systems, mkstemp() is less - * secure than you would like. For this reason, we do not auto-configure it. - * - * Some things to watch out for: some broken implementations of mkstemp() may - * not necessarily try a different filename when they are called, making it - * impossible to rename the file. Others make world-writable files. - */ -/*#define USE_MKSTEMP */ - -/******************************** * Comment this line out to let the user enter his/her email address * when sending a message. There should be no need to do this unless * your mailer agent does not put in the From: field for you. (If your @@ -1351,11 +1340,11 @@ * the version definition with the Project Version on checkout. Just * ignore it. - kw */ /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */ -#define LYNX_VERSION "2.8.5dev.2" +#define LYNX_VERSION "2.8.5dev.3" #define LYNX_WWW_HOME "http://lynx.browser.org/" #define LYNX_WWW_DIST "http://lynx.isc.org/current/" /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */ -#define LYNX_DATE "Wed, 15 Aug 2001 15:09:52 -0700" +#define LYNX_DATE "Sat, 06 Oct 2001 15:02:28 -0700" #define LYNX_DATE_OFF 5 /* truncate the automatically-generated date */ #define LYNX_DATE_LEN 11 /* truncate the automatically-generated date */ |