snapshot of project "lynx", label v2-8-8dev_1a

9 files changed, 38 insertions, 20 deletions

diff --git a/CHANGES b/CHANGES
index f211b2b4..d1d05f98 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,12 @@
--- $LynxId: CHANGES,v 1.438 2009/08/27 23:27:42 tom Exp $
+-- $LynxId: CHANGES,v 1.440 2009/09/06 18:48:52 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2009-09-?? (2.8.8dev.2)
+* modify configure script to check if linkage for bzlib and zlib succeeded -TD
+* update lynx_help_main.html to point to "release/lynx2-8-7" documentation -TD
+
 2009-08-28 (2.8.8dev.1)
 * add <sys/types.h> include in socklen_t configure check, from OpenBSD CVS
 * eliminate UCPutUtf8ToBuffer() - redundant -TD
diff --git a/WWW/Library/Implementation/HTParse.c b/WWW/Library/Implementation/HTParse.c
index 0505c634..4c2a63bc 100644
--- a/WWW/Library/Implementation/HTParse.c
+++ b/WWW/Library/Implementation/HTParse.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTParse.c,v 1.52 2009/08/27 18:43:30 tom Exp $
+ * $LynxId: HTParse.c,v 1.53 2009/09/06 18:18:06 tom Exp $
  *
  *		Parse HyperText Document Address		HTParse.c
  *		================================
@@ -280,8 +280,8 @@ static void convert_to_idna(char *host)
 	code = idna_to_ascii_8z(buffer, &output, IDNA_USE_STD3_ASCII_RULES);
 	if (code == IDNA_SUCCESS) {
 	    strcpy(host, output);
-	    free(output);
 	}
+	FREE(output);
 	free(buffer);
     }
 }
diff --git a/configure b/configure
index 82509c4f..a4635750 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in 2.8.7rel.1.
+# From configure.in 2.8.8dev.1.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20081225.
 #
@@ -29972,7 +29972,7 @@ else
 echo "$as_me: WARNING: Cannot find bz2 library" >&2;}
 fi
 
-	cat >>confdefs.h <<\EOF
+	test "x$cf_cv_find_linkage_bz2" = "xyes" && cat >>confdefs.h <<\EOF
 #define USE_BZLIB 1
 EOF
 
@@ -30756,7 +30756,7 @@ else
 echo "$as_me: WARNING: Cannot find z library" >&2;}
 fi
 
-	cat >>confdefs.h <<\EOF
+	test "x$cf_cv_find_linkage_z" = "xyes" && cat >>confdefs.h <<\EOF
 #define USE_ZLIB 1
 EOF
 
diff --git a/configure.in b/configure.in
index 0593992a..5d2a01b9 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.201 2009/08/28 21:48:17 tom Exp $
+dnl $LynxId: configure.in,v 1.202 2009/09/06 18:47:55 tom Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -1221,7 +1221,7 @@ AC_MSG_RESULT($use_bzlib)
 
 if test ".$use_bzlib" != ".no" ; then
 	CF_WITH_BZLIB($use_bzlib)
-	AC_DEFINE(USE_BZLIB)
+	test "x$cf_cv_find_linkage_bz2" = "xyes" && AC_DEFINE(USE_BZLIB)
 fi
 
 dnl --------------------------------------------------------------------------
@@ -1234,7 +1234,7 @@ AC_MSG_RESULT($use_zlib)
 
 if test ".$use_zlib" != ".no" ; then
 	CF_WITH_ZLIB($use_zlib)
-	AC_DEFINE(USE_ZLIB)
+	test "x$cf_cv_find_linkage_z" = "xyes" && AC_DEFINE(USE_ZLIB)
 fi
 
 dnl --------------------------------------------------------------------------
diff --git a/docs/README.release b/docs/README.release
new file mode 100644
index 00000000..a5dbd808
--- /dev/null
+++ b/docs/README.release
@@ -0,0 +1,14 @@
+-- $LynxId: README.release,v 1.1 2009/09/06 13:57:02 tom Exp $
+
+The version number with dots appears in, e.g.,
+	README
+	docs/README.metrics
+	lynx.hlp
+	lynx.man
+	lynx_help/Lynx_users_guide.html
+
+The version number with dashes appears in several places, e.g.,
+	lynx.cfg
+	lynx_help/lynx_help_main.html
+	makefile.in
+	userdefs.h
diff --git a/lynx.cfg b/lynx.cfg
index 240dfa0b..17929f83 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,4 +1,4 @@
-# $LynxId: lynx.cfg,v 1.183 2009/08/28 21:48:17 tom Exp $
+# $LynxId: lynx.cfg,v 1.184 2009/09/06 11:08:05 tom Exp $
 # lynx.cfg file.
 # The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
 #                                     or Lynx_Dir:lynx.cfg (VMS)
@@ -113,12 +113,12 @@ STARTFILE:http://lynx.isc.org/
 #   for this distribution (use SHELL syntax including the device
 #   on VMS systems).
 # The default HELPFILE is:
-# http://lynx.isc.org/release/lynx2-8-6/lynx_help/lynx_help_main.html
+# http://lynx.isc.org/release/lynx2-8-7/lynx_help/lynx_help_main.html
 #   This should be changed to the local path.
 # This definition will be overridden if the "LYNX_HELPFILE" environment
 # variable has been set.
 #
-HELPFILE:http://lynx.isc.org/release/lynx2-8-6/lynx_help/lynx_help_main.html
+HELPFILE:http://lynx.isc.org/release/lynx2-8-7/lynx_help/lynx_help_main.html
 .ex
 #HELPFILE:file://localhost/PATH_TO/lynx_help/lynx_help_main.html
 
diff --git a/lynx_help/lynx_help_main.html b/lynx_help/lynx_help_main.html
index 1056e22d..2882764c 100644
--- a/lynx_help/lynx_help_main.html
+++ b/lynx_help/lynx_help_main.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//IETF//DTD HTML 3.0//EN">
-<!-- $LynxId: lynx_help_main.html,v 1.36 2007/05/06 17:38:49 tom Exp $ -->
+<!-- $LynxId: lynx_help_main.html,v 1.37 2009/09/06 10:57:55 tom Exp $ -->
 <html>
 <head>
 <title>The Lynx Help Page</title>
@@ -28,9 +28,9 @@
 <h2>Other sources of Lynx help:</h2>
 
 <ul>
-<li><a href="http://lynx.isc.org/release/lynx2-8-6/lynx_help/cattoc.html">lynx.cfg options</a>
+<li><a href="http://lynx.isc.org/release/lynx2-8-7/lynx_help/cattoc.html">lynx.cfg options</a>
  -- a reference for advanced configurations
-<li><a href="http://lynx.isc.org/release/lynx2-8-6/docs/">lynx documentation</a>
+<li><a href="http://lynx.isc.org/release/lynx2-8-7/docs/">lynx documentation</a>
  -- supplementary documentation
 <li><a href="http://www.chass.utoronto.ca/%7Epurslow/lhfb.html">Lynx Help for Beginners</a> -- quick help on many common problems
 <!-- {li}{a href="http://lynx.isc.org/cgi-bin/fom"}The Lynx FAQ-O-Matic{/a} .. many common queries, some more advanced; users may add answers. -->
diff --git a/makefile.in b/makefile.in
index bba1342a..f6394c1c 100644
--- a/makefile.in
+++ b/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.102 2009/08/25 08:36:27 tom Exp $
+# $LynxId: makefile.in,v 1.103 2009/09/06 11:08:16 tom Exp $
 ##makefile for lynx
 
 SHELL		= @CONFIG_SHELL@
@@ -329,7 +329,7 @@ install-doc : $(DOCDIR) $(HELPDIR)
 # So we limit sed delimiters to '!' and '%', depending on the expected text.
 FIX_SED = tr '=' '"'
 
-LYNX_URL='http://lynx.isc.org/release/lynx2-8-6'
+LYNX_URL='http://lynx.isc.org/release/lynx2-8-7'
 LYNXDOCS_URL='$(LYNX_URL)/docs/'
 LYNXHELP_URL='$(LYNX_URL)/lynx_help/'
 
diff --git a/userdefs.h b/userdefs.h
index 742b3375..2df8335b 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: userdefs.h,v 1.250 2009/08/28 21:48:17 tom Exp $
+ * $LynxId: userdefs.h,v 1.251 2009/09/06 11:08:26 tom Exp $
  *
  * Lynx - Hypertext navigation system
  *
@@ -486,12 +486,12 @@
  *   for this distribution (use SHELL syntax including the device
  *   on VMS systems).
  * The default HELPFILE is:
- * http://lynx.isc.org/release/lynx2-8-6/lynx_help/lynx_help_main.html
+ * http://lynx.isc.org/release/lynx2-8-7/lynx_help/lynx_help_main.html
  *   This should be changed here or in lynx.cfg to the local path.
  * The definition here can be overridden at run time by defining a
  * "LYNX_HELPFILE" environment variable.
  */
-#define HELPFILE "http://lynx.isc.org/release/lynx2-8-6/lynx_help/lynx_help_main.html"
+#define HELPFILE "http://lynx.isc.org/release/lynx2-8-7/lynx_help/lynx_help_main.html"
 /* #define HELPFILE "file://localhost/PATH_TO/lynx_help/lynx_help_main.html" */
 
 /*****************************