diff options
-rw-r--r-- | CHANGES | 27 | ||||
-rw-r--r-- | WWW/Library/Implementation/HTFTP.c | 20 | ||||
-rw-r--r-- | WWW/Library/Implementation/HTTCP.c | 5 | ||||
-rw-r--r-- | WWW/Library/Implementation/HTTelnet.c | 3 | ||||
-rw-r--r-- | WWW/Library/Implementation/LYLeaks.h | 2 | ||||
-rw-r--r-- | aclocal.m4 | 26 | ||||
-rwxr-xr-x | configure | 318 | ||||
-rw-r--r-- | configure.in | 6 | ||||
-rw-r--r-- | makefile.in | 2 | ||||
-rw-r--r-- | src/LYMainLoop.c | 6 | ||||
-rw-r--r-- | src/LYPrettySrc.c | 21 | ||||
-rw-r--r-- | src/descrip.mms | 15 | ||||
-rw-r--r-- | src/makefile.in | 4 | ||||
-rw-r--r-- | userdefs.h | 4 |
14 files changed, 264 insertions, 195 deletions
diff --git a/CHANGES b/CHANGES index d0d72ed4..44043eb5 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,33 @@ Changes since Lynx 2.8 release =============================================================================== +2000-10-18 (2.8.4dev.11) +* include LYLeaks.h in LYPrettySrc.c to allow leak-checking -TD +* modify configure script macro CF_RECHECK_FUNC to ensure that we add a given + library only once to the resulting list. This fixes a longstanding bug which + caused the nsl library to be repeated on some platforms (reported by BL for + one of the SCO configurations, and Urs JanBen <urs@tin.org> for SINIX-L 5.41 + (i386-sni-sysv4)) -TD +* modify "make install-doc" rule to first remove targets. Otherwise "ln -s" + and "cp" fail to create the targets when installing with normal user + permissions (reported by LV) -TD +* fix for handle_LYK_DWIMEDIT() to ensure it does not dereference a null + pointer, when trying to edit a text file with no links within it (report by + Harri Tuominen) -DK +* add fallback definitions to accommodate renaming of UCX$xxx symbols to + TCPIP$xxx in recent versions of OpenVMS UCX (reported by Horst Drechsel + <ai05@sternwarte.uni-erlangen.de>) -TD +* add TRSTable.obj to src/descrip.mms objects -TD +* modify configure script to omit LYExtern.o and LYLocal.o if the corresponding + options (externs and dired) are disabled -TD +* correct a typo that made configure script always define USE_EXTERNALS -TD +* interpret ftp server type for VMS if a URL is given with "/~name", as a + Unix-style server. This works for the following, at least: + VMS V6.2 AlphaServer 2100 4/233 MadGoat System type. + (reported by Rick Dyson <dyson@iowasp.physics.uiowa.edu>) -TD +* make configure check for getaddrinfo() less strict, needed with --enable-ipv6 + on IPv4-only system (patch by Munechika SUMIKAWA) + 2000-09-21 (2.8.4dev.10) * modified www_tcp.h and makefile.msc to allow compile with winsock2 if USE_WINSOCK2_H is defined -TD diff --git a/WWW/Library/Implementation/HTFTP.c b/WWW/Library/Implementation/HTFTP.c index 91cbc282..82c8ccbf 100644 --- a/WWW/Library/Implementation/HTFTP.c +++ b/WWW/Library/Implementation/HTFTP.c @@ -729,6 +729,7 @@ PRIVATE int get_connection ARGS2( /* Get node name: */ + CTRACE((tfp, "get_connection(%s)\n", arg)); { char *p1 = HTParse(arg, "", PARSE_HOST); char *p2 = strrchr(p1, '@'); /* user? */ @@ -960,9 +961,17 @@ PRIVATE int get_connection ARGS2( CTRACE((tfp, "HTFTP: Treating as MSDOS (Unix emulation) server.\n")); } else if (strncmp(response_text+4, "VMS", 3) == 0) { - server_type = VMS_SERVER; + char *tilde = strstr(arg, "/~"); use_list = TRUE; - CTRACE((tfp, "HTFTP: Treating as VMS server.\n")); + if (tilde != 0 + && tilde[2] != 0 + && strstr(response_text+4, "MadGoat") != 0) { + server_type = UNIX_SERVER; + CTRACE((tfp, "HTFTP: Treating VMS as UNIX server.\n")); + } else { + server_type = VMS_SERVER; + CTRACE((tfp, "HTFTP: Treating as VMS server.\n")); + } } else if ((strncmp(response_text+4, "VM/CMS", 6) == 0) || (strncmp(response_text+4, "VM ", 3) == 0)) { @@ -3253,6 +3262,7 @@ PUBLIC int HTFTPLoad ARGS4( { char *cp1, *cp2; BOOL included_device = FALSE; + BOOL found_tilde = FALSE; /** Accept only Unix-style filename **/ if (strchr(filename, ':') != NULL || strchr(filename, '[') != NULL) { @@ -3415,8 +3425,10 @@ PUBLIC int HTFTPLoad ARGS4( goto listen; } /** Otherwise, go to appropriate directory and doctor filename **/ - if (!strncmp(filename, "/~", 2)) + if (!strncmp(filename, "/~", 2)) { filename += 2; + found_tilde = TRUE; + } CTRACE((tfp, "check '%s' to translate x/y/ to [.x.y]\n", filename)); if (!included_device && (cp = strchr(filename, '/')) != NULL && @@ -3443,7 +3455,7 @@ PUBLIC int HTFTPLoad ARGS4( } filename = cp1+1; } else { - if (!included_device) { + if (!included_device && !found_tilde) { filename += 1; } } diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c index bc696abd..673e4727 100644 --- a/WWW/Library/Implementation/HTTCP.c +++ b/WWW/Library/Implementation/HTTCP.c @@ -152,6 +152,9 @@ PUBLIC int HTioctl ARGS3( set_errno(EBADF); return -1; } +#ifndef UCX$C_IOCTL +#define UCX$C_IOCTL TCPIP$C_IOCTL +#endif ioctl_desc.opt = UCX$C_IOCTL; ioctl_desc.len = sizeof(struct comm); ioctl_desc.addr = &ioctl_comm; @@ -1528,6 +1531,8 @@ PRIVATE void get_host_details NOARGS */ if (strchr(hostname,'.') == NULL) { /* Not full address */ domain_name = getenv("UCX$BIND_DOMAIN"); + if (domain_name == NULL) + domain_name = getenv("TCPIP$BIND_DOMAIN"); if (domain_name != NULL) { StrAllocCat(hostname, "."); StrAllocCat(hostname, domain_name); diff --git a/WWW/Library/Implementation/HTTelnet.c b/WWW/Library/Implementation/HTTelnet.c index 4c16139f..9f5f3a14 100644 --- a/WWW/Library/Implementation/HTTelnet.c +++ b/WWW/Library/Implementation/HTTelnet.c @@ -406,7 +406,8 @@ PRIVATE int remote_session ARGS2(char *, acc_method, char *, host) do_system(command); return HT_NO_DATA; /* Ok - it was done but no data */ } - else if (getenv("UCX$DEVICE") != NULL) { + else if (getenv("UCX$DEVICE") != NULL + || getenv("TCPIP$DEVICE") != NULL) { if (login_protocol == rlogin) { HTSprintf0(&command, "RLOGIN%s%s %s %s", user ? "/USERNAME=" : "", diff --git a/WWW/Library/Implementation/LYLeaks.h b/WWW/Library/Implementation/LYLeaks.h index fc2a0dc0..fe995fb6 100644 --- a/WWW/Library/Implementation/LYLeaks.h +++ b/WWW/Library/Implementation/LYLeaks.h @@ -46,7 +46,7 @@ ** LY_FIND_LEAKS_EXTENDED is defined. - kw */ -/* Undefine this to get no inproved HTSprintf0/HTSprintf tracking: */ +/* Undefine this to get no improved HTSprintf0/HTSprintf tracking: */ #define LY_FIND_LEAKS_EXTENDED /* diff --git a/aclocal.m4 b/aclocal.m4 index 2bda61d8..9113dd2a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -4,7 +4,7 @@ dnl and Jim Spath <jspath@mail.bcpl.lib.md.us> dnl and Philippe De Muyter <phdm@macqel.be> dnl dnl Created: 1997/1/28 -dnl Updated: 2000/7/11 +dnl Updated: 2000/10/12 dnl dnl The autoconf used in Lynx development is GNU autoconf, patched dnl by Tom Dickey. See your local GNU archives, and this URL: @@ -648,11 +648,13 @@ dnl Check if we're accidentally using a cache from a different machine. dnl Derive the system name, as a check for reusing the autoconf cache. dnl dnl If we've packaged config.guess and config.sub, run that (since it does a -dnl better job than uname). +dnl better job than uname). Normally we'll use AC_CANONICAL_HOST, but allow +dnl an extra parameter that we may override, e.g., for AC_CANONICAL_SYSTEM +dnl which is useful in cross-compiles. AC_DEFUN([CF_CHECK_CACHE], [ if test -f $srcdir/config.guess ; then - AC_CANONICAL_HOST + ifelse([$1],,[AC_CANONICAL_HOST],[$1]) system_name="$host_os" else system_name="`(uname -s -r) 2>/dev/null`" @@ -1403,7 +1405,9 @@ int main() } } - if (inet6 != 2 || inet4 != 2) + if (!(inet4 == 0 || inet4 == 2)) + goto bad; + if (!(inet6 == 0 || inet6 == 2)) goto bad; if (aitop) @@ -1510,7 +1514,7 @@ dnl compiler warnings. Though useful, not all are supported -- and contrary dnl to documentation, unrecognized directives cause older compilers to barf. AC_DEFUN([CF_GCC_ATTRIBUTES], [ -if test -n "$GCC" +if test "$GCC" = yes then cat > conftest.i <<EOF #ifndef GCC_PRINTF @@ -1526,7 +1530,7 @@ cat > conftest.i <<EOF #define GCC_UNUSED /* nothing */ #endif EOF -if test -n "$GCC" +if test "$GCC" = yes then AC_CHECKING([for $CC __attribute__ directives]) changequote(,)dnl @@ -1593,7 +1597,7 @@ dnl -pedantic dnl AC_DEFUN([CF_GCC_WARNINGS], [ -if test -n "$GCC" +if test "$GCC" = yes then changequote(,)dnl cat > conftest.$ac_ext <<EOF @@ -2242,7 +2246,7 @@ AC_CHECK_LIB($2,$1,[ CF_UPPER(cf_tr_func,$1) AC_DEFINE_UNQUOTED(HAVE_$cf_tr_func) ac_cv_func_$1=yes - $3="-l$2 [$]$3"],[ + if test "$cf_used_lib_$2" != yes ; then cf_used_lib_$2=yes; $3="-l$2 [$]$3"; fi],[ ac_cv_func_$1=unknown unset ac_cv_func_$1 2>/dev/null $4], @@ -2314,14 +2318,14 @@ do CFLAGS="$cf_save_CFLAGS" test -n "$cf_opts" && CFLAGS="$CFLAGS -D$cf_opts" AC_TRY_COMPILE([#include <sys/types.h> -#if HAVE_TERMIOS_H +#ifdef HAVE_TERMIOS_H #include <termios.h> #else -#if HAVE_TERMIO_H +#ifdef HAVE_TERMIO_H #include <termio.h> #endif #endif -#if NEED_PTEM_H +#ifdef NEED_PTEM_H /* This is a workaround for SCO: they neglected to define struct winsize in * termios.h -- it's only in termio.h and ptem.h */ diff --git a/configure b/configure index 39190761..2b2725fc 100755 --- a/configure +++ b/configure @@ -1398,7 +1398,7 @@ echo "$ac_t""$with_warnings" 1>&6 if test "$with_warnings" = "yes" then -if test -n "$GCC" +if test "$GCC" = yes then cat > conftest.i <<EOF #ifndef GCC_PRINTF @@ -1414,7 +1414,7 @@ cat > conftest.i <<EOF #define GCC_UNUSED /* nothing */ #endif EOF -if test -n "$GCC" +if test "$GCC" = yes then echo "checking for $CC __attribute__ directives" 1>&6 echo "configure:1421: checking for $CC __attribute__ directives" >&5 @@ -1471,7 +1471,7 @@ rm -rf conftest* fi -if test -n "$GCC" +if test "$GCC" = yes then cat > conftest.$ac_ext <<EOF #line 1478 "configure" @@ -5913,7 +5913,7 @@ cf_tr_func=`echo "gethostname" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJK EOF ac_cv_func_gethostname=yes - cf_cv_netlibs="-lnsl $cf_cv_netlibs" + if test "$cf_used_lib_nsl" != yes ; then cf_used_lib_nsl=yes; cf_cv_netlibs="-lnsl $cf_cv_netlibs"; fi else echo "$ac_t""no" 1>&6 @@ -5965,7 +5965,7 @@ cf_tr_func=`echo "gethostname" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJK EOF ac_cv_func_gethostname=yes - cf_cv_netlibs="-lsocket $cf_cv_netlibs" + if test "$cf_used_lib_socket" != yes ; then cf_used_lib_socket=yes; cf_cv_netlibs="-lsocket $cf_cv_netlibs"; fi else echo "$ac_t""no" 1>&6 @@ -6120,7 +6120,7 @@ cf_tr_func=`echo "socket" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOP EOF ac_cv_func_socket=yes - cf_cv_netlibs="-lsocket $cf_cv_netlibs" + if test "$cf_used_lib_socket" != yes ; then cf_used_lib_socket=yes; cf_cv_netlibs="-lsocket $cf_cv_netlibs"; fi else echo "$ac_t""no" 1>&6 @@ -6172,7 +6172,7 @@ cf_tr_func=`echo "socket" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOP EOF ac_cv_func_socket=yes - cf_cv_netlibs="-lbsd $cf_cv_netlibs" + if test "$cf_used_lib_bsd" != yes ; then cf_used_lib_bsd=yes; cf_cv_netlibs="-lbsd $cf_cv_netlibs"; fi else echo "$ac_t""no" 1>&6 @@ -6287,7 +6287,7 @@ cf_tr_func=`echo "gethostbyname" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHI EOF ac_cv_func_gethostbyname=yes - cf_cv_netlibs="-lnsl $cf_cv_netlibs" + if test "$cf_used_lib_nsl" != yes ; then cf_used_lib_nsl=yes; cf_cv_netlibs="-lnsl $cf_cv_netlibs"; fi else echo "$ac_t""no" 1>&6 @@ -6398,7 +6398,7 @@ cf_tr_func=`echo "strcasecmp" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKL EOF ac_cv_func_strcasecmp=yes - cf_cv_netlibs="-lresolv $cf_cv_netlibs" + if test "$cf_used_lib_resolv" != yes ; then cf_used_lib_resolv=yes; cf_cv_netlibs="-lresolv $cf_cv_netlibs"; fi else echo "$ac_t""no" 1>&6 @@ -8080,7 +8080,7 @@ cf_tr_func=`echo "acos" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQR EOF ac_cv_func_acos=yes - LIBS="-lm $LIBS" + if test "$cf_used_lib_m" != yes ; then cf_used_lib_m=yes; LIBS="-lm $LIBS"; fi else echo "$ac_t""no" 1>&6 @@ -11264,14 +11264,14 @@ do #line 11265 "configure" #include "confdefs.h" #include <sys/types.h> -#if HAVE_TERMIOS_H +#ifdef HAVE_TERMIOS_H #include <termios.h> #else -#if HAVE_TERMIO_H +#ifdef HAVE_TERMIO_H #include <termio.h> #endif #endif -#if NEED_PTEM_H +#ifdef NEED_PTEM_H /* This is a workaround for SCO: they neglected to define struct winsize in * termios.h -- it's only in termio.h and ptem.h */ @@ -12295,7 +12295,9 @@ int main() } } - if (inet6 != 2 || inet4 != 2) + if (!(inet4 == 0 || inet4 == 2)) + goto bad; + if (!(inet6 == 0 || inet6 == 2)) goto bad; if (aitop) @@ -12309,7 +12311,7 @@ int main() } EOF -if { (eval echo configure:12313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12315: \"$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 @@ -12352,7 +12354,7 @@ fi fi echo $ac_n "checking if experimental element-justification logic should be used""... $ac_c" 1>&6 -echo "configure:12356: checking if experimental element-justification logic should be used" >&5 +echo "configure:12358: 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 @@ -12376,7 +12378,7 @@ EOF echo $ac_n "checking if experimental keyboard-layout logic should be used""... $ac_c" 1>&6 -echo "configure:12380: checking if experimental keyboard-layout logic should be used" >&5 +echo "configure:12382: 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 @@ -12400,7 +12402,7 @@ EOF echo $ac_n "checking if experimental JavaScript support should be used""... $ac_c" 1>&6 -echo "configure:12404: checking if experimental JavaScript support should be used" >&5 +echo "configure:12406: 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 @@ -12424,7 +12426,7 @@ EOF echo $ac_n "checking if html source should be colorized""... $ac_c" 1>&6 -echo "configure:12428: checking if html source should be colorized" >&5 +echo "configure:12430: checking if html source should be colorized" >&5 # Check whether --enable-prettysrc or --disable-prettysrc was given. if test "${enable_prettysrc+set}" = set; then @@ -12448,7 +12450,7 @@ EOF echo $ac_n "checking if read-progress message should show ETA""... $ac_c" 1>&6 -echo "configure:12452: checking if read-progress message should show ETA" >&5 +echo "configure:12454: 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 @@ -12472,7 +12474,7 @@ EOF echo $ac_n "checking if scrollbar code should be used""... $ac_c" 1>&6 -echo "configure:12476: checking if scrollbar code should be used" >&5 +echo "configure:12478: checking if scrollbar code should be used" >&5 # Check whether --enable-scrollbar or --disable-scrollbar was given. if test "${enable_scrollbar+set}" = set; then @@ -12503,7 +12505,7 @@ EOF fi echo $ac_n "checking if source caching should be used""... $ac_c" 1>&6 -echo "configure:12507: checking if source caching should be used" >&5 +echo "configure:12509: 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 @@ -12530,7 +12532,7 @@ EOF echo $ac_n "checking if alternative line-edit bindings should be used""... $ac_c" 1>&6 -echo "configure:12534: checking if alternative line-edit bindings should be used" >&5 +echo "configure:12536: 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 @@ -12554,7 +12556,7 @@ EOF echo $ac_n "checking if you want to use extended HTML DTD logic""... $ac_c" 1>&6 -echo "configure:12558: checking if you want to use extended HTML DTD logic" >&5 +echo "configure:12560: 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 @@ -12578,7 +12580,7 @@ EOF echo $ac_n "checking if partial-display should be used""... $ac_c" 1>&6 -echo "configure:12582: checking if partial-display should be used" >&5 +echo "configure:12584: checking if partial-display should be used" >&5 # Check whether --enable-partial or --disable-partial was given. if test "${enable_partial+set}" = set; then @@ -12602,7 +12604,7 @@ EOF echo $ac_n "checking if you want to use external commands""... $ac_c" 1>&6 -echo "configure:12606: checking if you want to use external commands" >&5 +echo "configure:12608: 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 @@ -12620,13 +12622,16 @@ else fi echo "$ac_t""$use_externs" 1>&6 -test $use_externs != ".no" && cat >> confdefs.h <<\EOF +if test $use_externs != "no" ; then + cat >> confdefs.h <<\EOF #define USE_EXTERNALS 1 EOF + LIBOBJS="$LIBOBJS LYExtern.o" +fi echo $ac_n "checking if you want to use setfont support""... $ac_c" 1>&6 -echo "configure:12630: checking if you want to use setfont support" >&5 +echo "configure:12635: 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 @@ -12650,7 +12655,7 @@ EOF echo $ac_n "checking if you want cgi-link support""... $ac_c" 1>&6 -echo "configure:12654: checking if you want cgi-link support" >&5 +echo "configure:12659: 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 @@ -12669,7 +12674,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you want change-exec support""... $ac_c" 1>&6 -echo "configure:12673: checking if you want change-exec support" >&5 +echo "configure:12678: 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 @@ -12693,7 +12698,7 @@ EOF echo $ac_n "checking if you want exec-links support""... $ac_c" 1>&6 -echo "configure:12697: checking if you want exec-links support" >&5 +echo "configure:12702: 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 @@ -12717,7 +12722,7 @@ EOF echo $ac_n "checking if you want exec-scripts support""... $ac_c" 1>&6 -echo "configure:12721: checking if you want exec-scripts support" >&5 +echo "configure:12726: 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 @@ -12741,7 +12746,7 @@ EOF echo $ac_n "checking if you want internal-links feature""... $ac_c" 1>&6 -echo "configure:12745: checking if you want internal-links feature" >&5 +echo "configure:12750: 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 @@ -12765,7 +12770,7 @@ EOF echo $ac_n "checking if you want to fork NSL requests""... $ac_c" 1>&6 -echo "configure:12769: checking if you want to fork NSL requests" >&5 +echo "configure:12774: 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 @@ -12789,7 +12794,7 @@ EOF echo $ac_n "checking if you want to log URL requests via syslog""... $ac_c" 1>&6 -echo "configure:12793: checking if you want to log URL requests via syslog" >&5 +echo "configure:12798: 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 @@ -12813,7 +12818,7 @@ EOF echo $ac_n "checking if persistent-cookie logic should be used""... $ac_c" 1>&6 -echo "configure:12817: checking if persistent-cookie logic should be used" >&5 +echo "configure:12822: 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 @@ -12837,7 +12842,7 @@ EOF echo $ac_n "checking if you want to underline links""... $ac_c" 1>&6 -echo "configure:12841: checking if you want to underline links" >&5 +echo "configure:12846: checking if you want to underline links" >&5 # Check whether --enable-underlines or --disable-underlines was given. if test "${enable_underlines+set}" = set; then @@ -12861,7 +12866,7 @@ EOF echo $ac_n "checking if help files should be gzip'ed""... $ac_c" 1>&6 -echo "configure:12865: checking if help files should be gzip'ed" >&5 +echo "configure:12870: 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 @@ -12890,7 +12895,7 @@ fi echo $ac_n "checking if you want to use zlib for decompression of some gzip files""... $ac_c" 1>&6 -echo "configure:12894: checking if you want to use zlib for decompression of some gzip files" >&5 +echo "configure:12899: 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 @@ -12904,16 +12909,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:12908: checking if we need to add -I option to get zlib.h" >&5 +echo "configure:12913: checking if we need to add -I option to get zlib.h" >&5 cat > conftest.$ac_ext <<EOF -#line 12910 "configure" +#line 12915 "configure" #include "confdefs.h" #include <zlib.h> int main() { ; return 0; } EOF -if { (eval echo configure:12917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -12967,12 +12972,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:12971: checking for gzopen" >&5 +echo "configure:12976: 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 12976 "configure" +#line 12981 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gzopen(); below. */ @@ -12995,7 +13000,7 @@ gzopen(); ; return 0; } EOF -if { (eval echo configure:12999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13004: \"$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 @@ -13015,17 +13020,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for gzopen in -lz""... $ac_c" 1>&6 -echo "configure:13019: checking for gzopen in -lz" >&5 +echo "configure:13024: checking for gzopen in -lz" >&5 LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 13022 "configure" +#line 13027 "configure" #include "confdefs.h" #include <zlib.h> int main() { gzopen("name","mode") ; return 0; } EOF -if { (eval echo configure:13029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13034: \"$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' @@ -13069,17 +13074,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:13073: checking for -lz in $cf_libdir" >&5 +echo "configure:13078: checking for -lz in $cf_libdir" >&5 LIBS="-L$cf_libdir -lz $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 13076 "configure" +#line 13081 "configure" #include "confdefs.h" #include <zlib.h> int main() { gzopen("name","mode") ; return 0; } EOF -if { (eval echo configure:13083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13088: \"$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' @@ -13113,7 +13118,7 @@ EOF fi echo $ac_n "checking if you want to exclude FINGER code""... $ac_c" 1>&6 -echo "configure:13117: checking if you want to exclude FINGER code" >&5 +echo "configure:13122: 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 @@ -13137,7 +13142,7 @@ EOF echo $ac_n "checking if you want to exclude GOPHER code""... $ac_c" 1>&6 -echo "configure:13141: checking if you want to exclude GOPHER code" >&5 +echo "configure:13146: 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 @@ -13161,7 +13166,7 @@ EOF echo $ac_n "checking if you want to exclude NEWS code""... $ac_c" 1>&6 -echo "configure:13165: checking if you want to exclude NEWS code" >&5 +echo "configure:13170: 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 @@ -13185,7 +13190,7 @@ EOF echo $ac_n "checking if you want to exclude FTP code""... $ac_c" 1>&6 -echo "configure:13189: checking if you want to exclude FTP code" >&5 +echo "configure:13194: 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 @@ -13214,7 +13219,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:13218: checking if directory-editor code should be used" >&5 +echo "configure:13223: 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 @@ -13234,13 +13239,14 @@ fi echo "$ac_t""$use_dired" 1>&6 if test ".$use_dired" != ".no" ; then + LIBOBJS="$LIBOBJS LYLocal.o" cat >> confdefs.h <<\EOF #define DIRED_SUPPORT 1 EOF echo $ac_n "checking if you wish to allow extracting from archives via DirEd""... $ac_c" 1>&6 -echo "configure:13244: checking if you wish to allow extracting from archives via DirEd" >&5 +echo "configure:13250: 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 @@ -13259,7 +13265,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if DirEd mode should override keys""... $ac_c" 1>&6 -echo "configure:13263: checking if DirEd mode should override keys" >&5 +echo "configure:13269: 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 @@ -13285,7 +13291,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:13289: checking if you wish to allow permissions commands via DirEd" >&5 +echo "configure:13295: 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 @@ -13311,7 +13317,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:13315: checking if you wish to allow executable-permission commands via DirEd" >&5 +echo "configure:13321: 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 @@ -13330,7 +13336,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:13334: checking if you wish to allow "tar" commands from DirEd" >&5 +echo "configure:13340: 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 @@ -13356,7 +13362,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:13360: checking if you wish to allow "uudecode" commands from DirEd" >&5 +echo "configure:13366: 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 @@ -13382,7 +13388,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:13386: checking if you wish to allow "zip" and "unzip" commands from DirEd" >&5 +echo "configure:13392: 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 @@ -13408,7 +13414,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:13412: checking if you wish to allow "gzip" and "gunzip" commands from DirEd" >&5 +echo "configure:13418: 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 @@ -13435,7 +13441,7 @@ fi fi echo $ac_n "checking if you want long-directory listings""... $ac_c" 1>&6 -echo "configure:13439: checking if you want long-directory listings" >&5 +echo "configure:13445: 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 @@ -13461,7 +13467,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if parent-directory references are permitted""... $ac_c" 1>&6 -echo "configure:13465: checking if parent-directory references are permitted" >&5 +echo "configure:13471: 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 @@ -13486,7 +13492,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:13490: checking for X" >&5 +echo "configure:13496: checking for X" >&5 # Check whether --with-x or --without-x was given. @@ -13549,12 +13555,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 13553 "configure" +#line 13559 "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:13558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13564: \"$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* @@ -13623,14 +13629,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 13627 "configure" +#line 13633 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:13634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13640: \"$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. @@ -13730,7 +13736,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:13734: checking for open in -lc_s" >&5 +echo "configure:13740: 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 @@ -13738,7 +13744,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_s $LIBS" cat > conftest.$ac_ext <<EOF -#line 13742 "configure" +#line 13748 "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 @@ -13749,7 +13755,7 @@ int main() { open() ; return 0; } EOF -if { (eval echo configure:13753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13759: \"$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 @@ -13766,7 +13772,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:13770: checking for gethostname in -lbsd" >&5 +echo "configure:13776: 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 @@ -13774,7 +13780,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <<EOF -#line 13778 "configure" +#line 13784 "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 @@ -13785,7 +13791,7 @@ int main() { gethostname() ; return 0; } EOF -if { (eval echo configure:13789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13795: \"$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 @@ -13802,7 +13808,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:13806: checking for gethostname in -lnsl_s" >&5 +echo "configure:13812: 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 @@ -13810,7 +13816,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl_s $LIBS" cat > conftest.$ac_ext <<EOF -#line 13814 "configure" +#line 13820 "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 @@ -13821,7 +13827,7 @@ int main() { gethostname() ; return 0; } EOF -if { (eval echo configure:13825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13831: \"$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 @@ -13838,7 +13844,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:13842: checking for XOpenDisplay in -lX11_s" >&5 +echo "configure:13848: 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 @@ -13846,7 +13852,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11_s $LIBS" cat > conftest.$ac_ext <<EOF -#line 13850 "configure" +#line 13856 "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 @@ -13857,7 +13863,7 @@ int main() { XOpenDisplay() ; return 0; } EOF -if { (eval echo configure:13861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13867: \"$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 @@ -13874,7 +13880,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:13878: checking for XtAppInitialize in -lXt_s" >&5 +echo "configure:13884: 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 @@ -13882,7 +13888,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXt_s $LIBS" cat > conftest.$ac_ext <<EOF -#line 13886 "configure" +#line 13892 "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 @@ -13893,7 +13899,7 @@ int main() { XtAppInitialize() ; return 0; } EOF -if { (eval echo configure:13897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13903: \"$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 @@ -13934,7 +13940,7 @@ fi ;; *) echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:13938: checking for socket in -lsocket" >&5 +echo "configure:13944: 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 @@ -13942,7 +13948,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 13946 "configure" +#line 13952 "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 @@ -13953,7 +13959,7 @@ int main() { socket() ; return 0; } EOF -if { (eval echo configure:13957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13963: \"$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 @@ -13981,7 +13987,7 @@ else fi echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:13985: checking for gethostname in -lnsl" >&5 +echo "configure:13991: 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 @@ -13989,7 +13995,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 13993 "configure" +#line 13999 "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 @@ -14000,7 +14006,7 @@ int main() { gethostname() ; return 0; } EOF -if { (eval echo configure:14004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14010: \"$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 @@ -14051,17 +14057,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:14055: checking whether -R must be followed by a space" >&5 +echo "configure:14061: 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 14058 "configure" +#line 14064 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:14065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -14077,14 +14083,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <<EOF -#line 14081 "configure" +#line 14087 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:14088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -14116,7 +14122,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:14120: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:14126: 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 @@ -14124,7 +14130,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <<EOF -#line 14128 "configure" +#line 14134 "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 @@ -14135,7 +14141,7 @@ int main() { dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:14139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14145: \"$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 @@ -14157,7 +14163,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:14161: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:14167: 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 @@ -14165,7 +14171,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <<EOF -#line 14169 "configure" +#line 14175 "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 @@ -14176,7 +14182,7 @@ int main() { dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:14180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14186: \"$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 @@ -14205,12 +14211,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:14209: checking for gethostbyname" >&5 +echo "configure:14215: 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 14214 "configure" +#line 14220 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ @@ -14233,7 +14239,7 @@ gethostbyname(); ; return 0; } EOF -if { (eval echo configure:14237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14243: \"$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 @@ -14254,7 +14260,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:14258: checking for gethostbyname in -lnsl" >&5 +echo "configure:14264: 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 @@ -14262,7 +14268,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 14266 "configure" +#line 14272 "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 @@ -14273,7 +14279,7 @@ int main() { gethostbyname() ; return 0; } EOF -if { (eval echo configure:14277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14283: \"$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 @@ -14303,12 +14309,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:14307: checking for connect" >&5 +echo "configure:14313: 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 14312 "configure" +#line 14318 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ @@ -14331,7 +14337,7 @@ connect(); ; return 0; } EOF -if { (eval echo configure:14335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14341: \"$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 @@ -14352,7 +14358,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:14356: checking for connect in -lsocket" >&5 +echo "configure:14362: 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 @@ -14360,7 +14366,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 14364 "configure" +#line 14370 "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 @@ -14371,7 +14377,7 @@ int main() { connect() ; return 0; } EOF -if { (eval echo configure:14375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14381: \"$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 @@ -14395,12 +14401,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:14399: checking for remove" >&5 +echo "configure:14405: 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 14404 "configure" +#line 14410 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove(); below. */ @@ -14423,7 +14429,7 @@ remove(); ; return 0; } EOF -if { (eval echo configure:14427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14433: \"$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 @@ -14444,7 +14450,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:14448: checking for remove in -lposix" >&5 +echo "configure:14454: 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 @@ -14452,7 +14458,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <<EOF -#line 14456 "configure" +#line 14462 "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 @@ -14463,7 +14469,7 @@ int main() { remove() ; return 0; } EOF -if { (eval echo configure:14467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14473: \"$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 @@ -14487,12 +14493,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:14491: checking for shmat" >&5 +echo "configure:14497: 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 14496 "configure" +#line 14502 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat(); below. */ @@ -14515,7 +14521,7 @@ shmat(); ; return 0; } EOF -if { (eval echo configure:14519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14525: \"$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 @@ -14536,7 +14542,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:14540: checking for shmat in -lipc" >&5 +echo "configure:14546: 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 @@ -14544,7 +14550,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <<EOF -#line 14548 "configure" +#line 14554 "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 @@ -14555,7 +14561,7 @@ int main() { shmat() ; return 0; } EOF -if { (eval echo configure:14559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14565: \"$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 @@ -14588,7 +14594,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:14592: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:14598: 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 @@ -14596,7 +14602,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 14600 "configure" +#line 14606 "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 @@ -14607,7 +14613,7 @@ int main() { IceConnectionNumber() ; return 0; } EOF -if { (eval echo configure:14611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14617: \"$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 @@ -14634,7 +14640,7 @@ fi LDFLAGS="$LDFLAGS $X_LIBS" CFLAGS="$CFLAGS $X_CFLAGS" echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:14638: checking for XOpenDisplay in -lX11" >&5 +echo "configure:14644: 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 @@ -14642,7 +14648,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 14646 "configure" +#line 14652 "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 @@ -14653,7 +14659,7 @@ int main() { XOpenDisplay() ; return 0; } EOF -if { (eval echo configure:14657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14663: \"$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 @@ -14674,7 +14680,7 @@ else fi echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:14678: checking for XtAppInitialize in -lXt" >&5 +echo "configure:14684: 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 @@ -14682,7 +14688,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 14686 "configure" +#line 14692 "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 @@ -14693,7 +14699,7 @@ int main() { XtAppInitialize() ; return 0; } EOF -if { (eval echo configure:14697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14703: \"$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 @@ -14750,7 +14756,7 @@ fi echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 -echo "configure:14754: checking for XextCreateExtension in -lXext" >&5 +echo "configure:14760: 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 @@ -14758,7 +14764,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $LIBS" cat > conftest.$ac_ext <<EOF -#line 14762 "configure" +#line 14768 "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 @@ -14769,7 +14775,7 @@ int main() { XextCreateExtension() ; return 0; } EOF -if { (eval echo configure:14773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14779: \"$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 @@ -14806,13 +14812,13 @@ do if test $cf_path != default ; then CFLAGS="-I$cf_path/include $cf_save" echo $ac_n "checking for $cf_test in $cf_path""... $ac_c" 1>&6 -echo "configure:14810: checking for $cf_test in $cf_path" >&5 +echo "configure:14816: checking for $cf_test in $cf_path" >&5 else echo $ac_n "checking for $cf_test""... $ac_c" 1>&6 -echo "configure:14813: checking for $cf_test" >&5 +echo "configure:14819: checking for $cf_test" >&5 fi cat > conftest.$ac_ext <<EOF -#line 14816 "configure" +#line 14822 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> @@ -14821,7 +14827,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14831: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_result=yes else @@ -14847,21 +14853,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:14851: checking for $cf_lib in $cf_path" >&5 +echo "configure:14857: 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:14855: checking for $cf_test in $cf_lib" >&5 +echo "configure:14861: checking for $cf_test in $cf_lib" >&5 fi cat > conftest.$ac_ext <<EOF -#line 14858 "configure" +#line 14864 "configure" #include "confdefs.h" int main() { $cf_test() ; return 0; } EOF -if { (eval echo configure:14865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -14902,7 +14908,7 @@ EOF LDFLAGS="$LDFLAGS $X_LIBS" CFLAGS="$CFLAGS $X_CFLAGS" echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:14906: checking for XOpenDisplay in -lX11" >&5 +echo "configure:14912: 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 @@ -14910,7 +14916,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 14914 "configure" +#line 14920 "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 @@ -14921,7 +14927,7 @@ int main() { XOpenDisplay() ; return 0; } EOF -if { (eval echo configure:14925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14931: \"$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 @@ -14942,14 +14948,14 @@ else fi echo $ac_n "checking for XCurses library""... $ac_c" 1>&6 -echo "configure:14946: checking for XCurses library" >&5 +echo "configure:14952: 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 14953 "configure" +#line 14959 "configure" #include "confdefs.h" #include <xcurses.h> @@ -14959,7 +14965,7 @@ int main() { XCursesExit(); ; return 0; } EOF -if { (eval echo configure:14963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_lib_XCurses=yes else @@ -14993,7 +14999,7 @@ fi else echo $ac_n "checking if we can include termio.h with curses""... $ac_c" 1>&6 -echo "configure:14997: checking if we can include termio.h with curses" >&5 +echo "configure:15003: 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 @@ -15002,7 +15008,7 @@ else CFLAGS="$CFLAGS -DHAVE_CONFIG_H -I. -I${srcdir-.} -I${srcdir-.}/src -I${srcdir-.}/WWW/Library/Implementation" touch lynx_cfg.h cat > conftest.$ac_ext <<EOF -#line 15006 "configure" +#line 15012 "configure" #include "confdefs.h" #include <LYCurses.h> @@ -15011,7 +15017,7 @@ int main() { putchar(0x0a) ; return 0; } EOF -if { (eval echo configure:15015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15021: \"$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 339bf6ff..2fbd77b5 100644 --- a/configure.in +++ b/configure.in @@ -825,7 +825,10 @@ CF_ARG_ENABLE(externs, [use_externs=yes], [use_externs=no]) AC_MSG_RESULT($use_externs) -test $use_externs != ".no" && AC_DEFINE(USE_EXTERNALS) +if test $use_externs != "no" ; then + AC_DEFINE(USE_EXTERNALS) + LIBOBJS="$LIBOBJS LYExtern.o" +fi AC_MSG_CHECKING(if you want to use setfont support) CF_ARG_ENABLE(font-switch, @@ -1001,6 +1004,7 @@ CF_ARG_DISABLE(dired, AC_MSG_RESULT($use_dired) if test ".$use_dired" != ".no" ; then + LIBOBJS="$LIBOBJS LYLocal.o" AC_DEFINE(DIRED_SUPPORT) AC_MSG_CHECKING(if you wish to allow extracting from archives via DirEd) diff --git a/makefile.in b/makefile.in index 952ce201..0687b1c1 100644 --- a/makefile.in +++ b/makefile.in @@ -328,6 +328,7 @@ install-doc : $(DOCDIR) $(HELPDIR) (cd $(srcdir) && tar cf - C[HO]* PROBLEMS README samples test ) | \ ( cd $(DOCDIR) && chmod -R u+w . && tar xf - ) $(SHELL) -c 'for name in COPYING COPYHEADER; do \ + cd $(HELPDIR) && rm -f $$name ;\ cd $(HELPDIR) && ( $(LN_S) $(DOCDIR)/$$name . || cp $(DOCDIR)/$$name . );\ done' @@ -442,6 +443,7 @@ uninstall-help :: uninstall \ uninstall-doc :: -test -d $(DOCDIR) && WD=`cd $(DOCDIR) && pwd` && HEAD=`echo $$WD|sed -e 's@/lynx_doc$$@@'` && test $$WD != $$HEAD && rm -rf $(DOCDIR) + -test -d $(HELPDIR) && WD=`cd $(HELPDIR) && pwd` && HEAD=`echo $$WD|sed -e 's@/lynx_help$$@@'` && test $$WD != $$HEAD && cd $(HELPDIR) && rm -f COPYING COPYHEADER $(BINDIR) $(MANDIR) $(LIBDIR) $(HELPDIR) $(DOCDIR) : $(srcdir)/mkdirs.sh $@ diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c index 9f40df98..bfe07c5f 100644 --- a/src/LYMainLoop.c +++ b/src/LYMainLoop.c @@ -2301,7 +2301,8 @@ PRIVATE int handle_LYK_DWIMEDIT ARGS3( * contents, rather than attempting to edit the html source * document. KED */ - if (links[curdoc.link].type == WWW_FORM_LINK_TYPE && + if (nlinks > 0 && + links[curdoc.link].type == WWW_FORM_LINK_TYPE && links[curdoc.link].form->type == F_TEXTAREA_TYPE) { *cmd = LYK_EDIT_TEXTAREA; return 2; @@ -2318,7 +2319,8 @@ PRIVATE int handle_LYK_DWIMEDIT ARGS3( * auto invocation of the editor on the TEXTAREA's contents * via the above if() statement.] */ - if (links[curdoc.link].type == WWW_FORM_LINK_TYPE && + if (nlinks > 0 && + links[curdoc.link].type == WWW_FORM_LINK_TYPE && links[curdoc.link].form->type == F_TEXT_TYPE) { HTUserMsg (CANNOT_EDIT_FIELD); return 1; diff --git a/src/LYPrettySrc.c b/src/LYPrettySrc.c index 73146629..3f3ca1aa 100644 --- a/src/LYPrettySrc.c +++ b/src/LYPrettySrc.c @@ -6,6 +6,7 @@ #include <LYHash.h> #include <LYPrettySrc.h> #include <LYStrings.h> +#include <LYLeaks.h> /* This file creates too many "leak detected" entries in Lynx.leaks. */ #define NO_MEMORY_TRACKING @@ -87,7 +88,7 @@ typedef enum _html_src_check_state PRIVATE void append_close_tag ARGS3( char*, tagname, HT_tagspec**, head, - HT_tagspec**, tail) + HT_tagspec**, tail) { int idx, nattr; HTTag* tag; @@ -103,10 +104,10 @@ PRIVATE void append_close_tag ARGS3( exit_immediately(-1); } - subj = (HT_tagspec*) calloc( sizeof(*subj), 1); + subj = typecalloc(HT_tagspec); subj->element = idx; - subj->present = (BOOL*)calloc( nattr*sizeof (BOOL), 1); - subj->value = (char**)calloc( nattr*sizeof (char*), 1); + subj->present = typecallocn(BOOL, nattr); + subj->value = typecallocn(char *, nattr); subj->start = FALSE; #ifdef USE_COLOR_STYLE subj->class_name = NULL; @@ -125,7 +126,7 @@ PRIVATE void append_open_tag ARGS4( char*, tagname, char*, classname GCC_UNUSED, HT_tagspec**, head, - HT_tagspec**, tail) + HT_tagspec**, tail) { HT_tagspec* subj; HTTag* tag; @@ -137,7 +138,7 @@ PRIVATE void append_open_tag ARGS4( subj = *tail; subj->start = TRUE; - tag = HTML_dtd.tags+subj->element; + tag = HTML_dtd.tags + subj->element; #ifdef USE_COLOR_STYLE hcode = hash_code_lowercase_on_fly(tagname); @@ -180,7 +181,7 @@ PUBLIC int html_src_parse_tagspec ARGS4( char stop = FALSE, after_excl = FALSE; html_src_check_state state = HTSRC_CK_normal; HT_tagspec* head = NULL, *tail = NULL; - HT_tagspec** slot = ( isstart ? lexeme_start : lexeme_end ) +lexeme; + HT_tagspec** slot = ( isstart ? lexeme_start : lexeme_end ) + lexeme; while (!stop) { switch (state) { @@ -289,10 +290,14 @@ PUBLIC void html_src_clean_item ARGS1( HTlexeme, l) { int i; + if (HTL_tagspecs[l]) FREE(HTL_tagspecs[l]); for(i = 0; i < 2; ++i) { - HT_tagspec* cur,** pts = ( i ? lexeme_start : lexeme_end)+l,*ts = *pts; + HT_tagspec* cur; + HT_tagspec** pts = ( i ? lexeme_start : lexeme_end) + l; + HT_tagspec* ts = *pts; + *pts = NULL; while (ts) { FREE(ts->present); diff --git a/src/descrip.mms b/src/descrip.mms index be7aef30..2f8def50 100644 --- a/src/descrip.mms +++ b/src/descrip.mms @@ -5,7 +5,7 @@ ! chrtrans header files before using this descrip.mms. ! ! History: -! 1/1/93 creation at KU (Lou montulli@ukanaix.cc.ukans.edu). +! 1/1/93 creation at KU (Lou montulli@ukanaix.cc.ukans.edu). ! 4/12/93 (seb@lns61.tn.cornell.edu) ! modified to support either UCX or MULTINET ! 12/2/93 modified to support Lynx rewrite @@ -54,15 +54,16 @@ ! $ MMS /Macro = (TCPWARE=1, GNU_C=1) for GNUC - OpenCMU TCP/IP ! $ MMS /Macro = (DECNET=1, GNU_C=1) for GNUC - socket emulation over DECnet -OBJS = DefaultStyle.obj, GridText.obj, HTAlert.obj, HTFWriter.obj, - +OBJS = DefaultStyle.obj, GridText.obj, HTAlert.obj, HTFWriter.obj, - HTInit.obj, HTML.obj, LYBookmark.obj, LYCgi.obj, LYCharSets.obj, - LYCharUtils.obj, LYClean.obj, LYCookie.obj, LYCurses.obj, - - LYDownload.obj, LYEdit.obj, LYEditmap.obj, LYexit.obj, LYForms.obj, - - LYGetFile.obj, LYHistory.obj, LYJump.obj, LYKeymap.obj, LYLeaks.obj, - - LYList.obj, LYMail.obj, LYMain.obj, LYMainLoop.obj, LYMap.obj, - - LYNews.obj, LYOptions.obj, LYPrint.obj, LYrcFile.obj, LYReadCFG.obj, - + LYDownload.obj, LYEdit.obj, LYEditmap.obj, LYForms.obj, - + LYGetFile.obj, LYHistory.obj, LYJump.obj, LYKeymap.obj, - + LYLeaks.obj, LYList.obj, LYMail.obj, LYMain.obj, LYMainLoop.obj, - + LYMap.obj, LYNews.obj, LYOptions.obj, LYPrint.obj, LYReadCFG.obj, - LYSearch.obj, LYShowInfo.obj, LYStrings.obj, LYTraversal.obj, - - LYUpload.obj, LYUtils.obj, UCAuto.obj, UCAux.obj, UCdomap.obj + LYUpload.obj, LYUtils.obj, LYexit.obj, LYrcFile.obj, TRSTable.obj, - + UCAuto.obj, UCAux.obj, UCdomap.obj .ifdef WIN_TCP TCP = WIN_TCP diff --git a/src/makefile.in b/src/makefile.in index 53ea0b33..ca4055b9 100644 --- a/src/makefile.in +++ b/src/makefile.in @@ -64,9 +64,9 @@ LYMail.o HTAlert.o GridText.o LYGetFile.o \ LYMain.o LYMainLoop.o LYCurses.o LYBookmark.o LYUtils.o \ LYOptions.o LYReadCFG.o LYSearch.o LYHistory.o \ LYForms.o LYPrint.o LYrcFile.o LYDownload.o LYNews.o LYKeymap.o \ -HTML.o HTFWriter.o HTInit.o DefaultStyle.o LYLocal.o LYUpload.o \ +HTML.o HTFWriter.o HTInit.o DefaultStyle.o LYUpload.o \ LYLeaks.o LYexit.o LYJump.o LYList.o LYCgi.o LYTraversal.o \ -LYEditmap.o LYCharSets.o LYCharUtils.o LYMap.o LYCookie.o LYExtern.o \ +LYEditmap.o LYCharSets.o LYCharUtils.o LYMap.o LYCookie.o \ LYStyle.o LYHash.o LYPrettySrc.o TRSTable.o $(CHARTRANS_OBJS) @LIBOBJS@ C_SRC = $(OBJS:.o=.c) diff --git a/userdefs.h b/userdefs.h index f96ff8ff..8d4abb0c 100644 --- a/userdefs.h +++ b/userdefs.h @@ -1345,11 +1345,11 @@ * the version definition with the Project Version on checkout. Just * ignore it. - kw */ /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */ -#define LYNX_VERSION "2.8.4dev.10" +#define LYNX_VERSION "2.8.4dev.11" #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 "Thu, 21 Sep 2000 19:21:59 -0700" +#define LYNX_DATE "Wed, 18 Oct 2000 18:54:01 -0700" #define LYNX_DATE_OFF 5 /* truncate the automatically-generated date */ #define LYNX_DATE_LEN 11 /* truncate the automatically-generated date */ |