about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGES6
-rw-r--r--WWW/Library/Implementation/HTUtils.h4
-rw-r--r--WWW/Library/Implementation/www_tcp.h4
-rwxr-xr-xcfg_defs.sh7
-rwxr-xr-xconfigure8
-rw-r--r--configure.in8
-rw-r--r--lynx.cfg4
-rw-r--r--makefile.in2
-rw-r--r--userdefs.h4
9 files changed, 31 insertions, 16 deletions
diff --git a/CHANGES b/CHANGES
index 45c4e145..dfa08dd1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,11 @@
 Changes since Lynx 2.8 release
 ===============================================================================
 
-2004-02-01 (2.8.5pre.5)
+2004-02-04 (2.8.5rel.1)
+* build fixes for MINGW32 -DK
+* build fixes for OS/2 (reported by IZ) -TD
+
+2004-02-02 (2.8.5pre.5)
 * MINGW32-specific changes to build with that configuration using the configure
   script in Cygwin and "-mno-cygwin" option -DK
 * move Cygwin defines for WIN_EX, _WINDOWS_NSL out of www_tcp.h, to the
diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h
index f1acb6b7..bf2f3bc3 100644
--- a/WWW/Library/Implementation/HTUtils.h
+++ b/WWW/Library/Implementation/HTUtils.h
@@ -168,6 +168,10 @@ char *alloca ();
 #define BOOLEAN_DEFINED
 #undef HAVE_POPEN		/* FIXME: does this not work, or is it missing */
 #undef small			/* see <w32api/rpcndr.h> */
+#endif
+
+/* cygwin, mingw32, etc. */
+#ifdef FILE_DOES_NOT_EXIST
 #undef FILE_DOES_NOT_EXIST	/* see <w32api/winnt.h> */
 #endif
 
diff --git a/WWW/Library/Implementation/www_tcp.h b/WWW/Library/Implementation/www_tcp.h
index 513b9402..56f00cf7 100644
--- a/WWW/Library/Implementation/www_tcp.h
+++ b/WWW/Library/Implementation/www_tcp.h
@@ -169,7 +169,11 @@ IBM-PC running Windows NT
 */
 
 #ifdef _WINDOWS
+
+#ifndef _WINDOWS_NSL
 #define _WINDOWS_NSL
+#endif
+
 #include <fcntl.h>                      /* For HTFile.c */
 #include <sys\types.h>                  /* For HTFile.c */
 #include <sys\stat.h>                   /* For HTFile.c */
diff --git a/cfg_defs.sh b/cfg_defs.sh
index 80a7c852..1be17106 100755
--- a/cfg_defs.sh
+++ b/cfg_defs.sh
@@ -5,6 +5,9 @@
 TOP="${1-.}"
 OUT=cfg_defs.h
 
+# just in case we want to run this outside the makefile
+: ${SHELL:=/bin/sh}
+
 cat >$OUT <<EOF
 #ifndef CFG_DEFS_H
 #define CFG_DEFS_H 1
@@ -20,7 +23,7 @@ sed \
 	-e 's/^.[^=]*_cv_//' \
 	-e 's/=\${.*=/=/'  \
 	-e 's/}$//'          \
-	config.cache | /bin/sh $TOP/cfg_edit.sh >>$OUT
+	config.cache | $SHELL $TOP/cfg_edit.sh >>$OUT
 
 cat >>$OUT <<EOF
 };
@@ -36,7 +39,7 @@ sed	-e 's@	@ @g' \
 	-e 's@^[ 	]*#define[ 	]*@@' \
 	-e 's@[ ]*/\*.*\*/@@' \
 	-e 's@[ 	][ 	]*@=@' \
-    | /bin/sh $TOP/cfg_edit.sh >>$OUT
+    | $SHELL $TOP/cfg_edit.sh >>$OUT
 
 cat >>$OUT <<EOF
 };
diff --git a/configure b/configure
index 2f05d3e3..a82757bb 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in 2.8.5pre.4
+# From configure.in 2.8.5pre.5
 
 # Save the original $CFLAGS so we can distinguish whether the user set those
 # in the environment, or whether autoconf added -O and -g options:
@@ -723,7 +723,7 @@ fi
 
 PACKAGE=lynx
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.5pre.5
+VERSION=2.8.5rel.1
 
 
 
@@ -13855,7 +13855,7 @@ if test $use_externs != "no" ; then
 #define USE_EXTERNALS 1
 EOF
 
-	LIBOBJS="$LIBOBJS LYExtern.o"
+	LIBOBJS="$LIBOBJS LYExtern\$o"
 fi
 
 echo $ac_n "checking if you want to use setfont support""... $ac_c" 1>&6
@@ -14871,7 +14871,7 @@ fi
 echo "$ac_t""$use_dired" 1>&6
 
 if test ".$use_dired" != ".no" ; then
-	LIBOBJS="$LIBOBJS LYLocal.o"
+	LIBOBJS="$LIBOBJS LYLocal\$o"
 	cat >> confdefs.h <<\EOF
 #define DIRED_SUPPORT 1
 EOF
diff --git a/configure.in b/configure.in
index 1d1aabda..e4f239d3 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
 dnl
 dnl ask PRCS to plug-in the project-version for the configure-script.
 dnl $Format: "AC_REVISION($ProjectVersion$)"$
-AC_REVISION(2.8.5pre.5)
+AC_REVISION(2.8.5rel.1)
 
 # Save the original $CFLAGS so we can distinguish whether the user set those
 # in the environment, or whether autoconf added -O and -g options:
@@ -33,7 +33,7 @@ CF_CHECK_CACHE
 PACKAGE=lynx
 dnl ask PRCS to plug-in the project-version for the packages.
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.5pre.5
+VERSION=2.8.5rel.1
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 AC_SUBST(DESTDIR)
@@ -862,7 +862,7 @@ CF_ARG_ENABLE(externs,
 AC_MSG_RESULT($use_externs)
 if test $use_externs != "no" ; then
 	AC_DEFINE(USE_EXTERNALS)
-	LIBOBJS="$LIBOBJS LYExtern.o"
+	LIBOBJS="$LIBOBJS LYExtern\$o"
 fi
 
 AC_MSG_CHECKING(if you want to use setfont support)
@@ -1021,7 +1021,7 @@ CF_ARG_DISABLE(dired,
 AC_MSG_RESULT($use_dired)
 
 if test ".$use_dired" != ".no" ; then
-	LIBOBJS="$LIBOBJS LYLocal.o"
+	LIBOBJS="$LIBOBJS LYLocal\$o"
 	AC_DEFINE(DIRED_SUPPORT)
 
 	AC_MSG_CHECKING(if you wish to allow extracting from archives via DirEd)
diff --git a/lynx.cfg b/lynx.cfg
index d85a3f01..494d45e6 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -3,10 +3,10 @@
 #                                     or Lynx_Dir:lynx.cfg (VMS)
 #
 # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
-#PRCS LYNX_VERSION "2.8.5pre.5"
+#PRCS LYNX_VERSION "2.8.5rel.1"
 #
 # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
-#PRCS LYNX_DATE "Mon, 02 Feb 2004 12:02:28 -0800"
+#PRCS LYNX_DATE "Wed, 04 Feb 2004 04:07:09 -0800"
 #
 # Definition pairs are of the form  VARIABLE:DEFINITION
 # NO spaces are allowed between the pair items.
diff --git a/makefile.in b/makefile.in
index ed385a98..51739650 100644
--- a/makefile.in
+++ b/makefile.in
@@ -396,7 +396,7 @@ LYHelp.h : help_files.sed LYHelp.hin
 
 cfg_defs.h : $(srcdir)/cfg_defs.sh $(srcdir)/cfg_edit.sh config.cache lynx_cfg.h
 	@rm -f $@
-	$(SHELL) $(srcdir)/cfg_defs.sh $(srcdir)
+	$(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(srcdir)/cfg_defs.sh $(srcdir)'
 
 install-cfg : $(LIBDIR)
 	@$(SHELL) -c '$(srcdir)/scripts/install-cfg.sh "$(INSTALL_DATA)" $(srcdir)/lynx.cfg $(LIBDIR)/lynx.cfg'
diff --git a/userdefs.h b/userdefs.h
index 32e594fa..11362595 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1360,11 +1360,11 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.5pre.5"
+#define LYNX_VERSION "2.8.5rel.1"
 #define LYNX_WWW_HOME "http://lynx.isc.org/"
 #define LYNX_WWW_DIST "http://lynx.isc.org/current/"
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Mon, 02 Feb 2004 12:02:28 -0800"
+#define LYNX_DATE "Wed, 04 Feb 2004 04:07:09 -0800"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2025-01-16 17:00:37 +0000