lynx-dev DOS patch for 2.8.4dev.20

[Doug Kaufman]

I just compiled 2.8.4dev.20 for DOS under DJGPP with
Internationalization and SSL. I would recommend the following patch
to the distribution make files for dos. The openssl port for DOS is
dependent on WATT32, so the link order for libraries has to be set
appropriately. I also made NESTED_TABLES the default and changed the
default locations for WATT-32 and PDCURSES. I doubt that many people
are actually keeping them as a subdirectores of lynx, which is what
had been the default. The DOS port of gettext is now dependent on
libiconv.a to convert character sets as the .mo file is read. The
format for the makefile in WWW/Library/djgpp now reflects the changes
previously made in the src makefile.

Perhaps the -wmemu should be left out by default. I use it when
compiling for distribution, so that lynx.exe will run on machines
without a floating point processor.

Similar changes should probably be made for SLANG, but I haven't had a
chance to test this yet.
                                 Doug

--- lynx2.8.4dev.20/lynx2-8-4/src/makefile.dos.ori      Sun Apr  1 16:51:46 2001
+++ lynx2.8.4dev.20/lynx2-8-4/src/makefile.dos  Sun May  6 17:03:48 2001
@@ -9,7 +9,7 @@
 LYEditmap.o LYCharSets.o LYCharUtils.o LYMap.o LYCookie.o LYExtern.o \
 LYStyle.o LYHash.o LYPrettySrc.o TRSTable.o
 
-CFLAGS= -O1 $(MCFLAGS) $(INTLFLAGS) -I. -I.. $(SLANGINC)
+CFLAGS= -O2 $(MCFLAGS) $(INTLFLAGS) -I. -I.. $(SLANGINC)
 
 # comment this line to suppress DIRED support
 DIRED_DEFS = \
@@ -37,6 +37,7 @@
  -DEXP_ALT_BINDINGS \
  -DEXP_FILE_UPLOAD \
  -DEXP_PERSISTENT_COOKIES \
+ -DEXP_NESTED_TABLES \
  -DFANCY_CURSES \
  -DNCURSES \
  -DNOUSERS \
@@ -48,25 +49,34 @@
  -DUSE_PRETTYSRC \
  -DUSE_ZLIB \
  -DWATT32 \
+ $(SSLFLAGS) \
+ $(SSLINC) \
  -I./chrtrans \
  -I../WWW/Library/Implementation \
- -I../curses \
- -I../djgpp/watt32/inc \
- -I../djgpp/watt32/inc/sys
+ -I/djgpp/pdcur24 \
+ -I/djgpp/watt32/inc \
+ -I/djgpp/watt32/inc/sys
 
 WWWLIB = \
  ../WWW/Library/djgpp/libwww.a \
- ../curses/pdcurses.a \
- ../djgpp/watt32/lib/libwatt.a
+ /djgpp/pdcur24/lib/pdcurses.a
 
-LIBS= -lz # -lintl
+LIBS= -L/djgpp/watt32/lib -lwatt -lz -lwmemu
+
+# Uncomment the following to enable Internationalization.
 #INTLFLAGS = -DHAVE_GETTEXT -DHAVE_LIBINTL_H
+#INTLLIBS= -lintl -liconv
+
+# Uncomment the followint to enable SSL.
+#SSLFLAGS = -DUSE_SSL
+#SSLLIB = -lssl -lcrypto
+#SSLINC = -I/djgpp/include/openssl
 
 all: lynx
 
 lynx:   message $(OBJS) $(WWWLIB)
        @echo "Linking and creating Lynx executable"
-       $(CC) $(CFLAGS) -o lynx.exe  $(OBJS) $(WWWLIB) $(LIBS)
+       $(CC) $(CFLAGS) -o lynx.exe  $(OBJS) $(WWWLIB) $(SSLLIB) $(LIBS) 
$(INTLLIBS)
        @echo "Welcome to Lynx!"
 
 message:
--- lynx2.8.4dev.20/lynx2-8-4/src/chrtrans/makefile.dos.ori     Sun Mar 12 
16:38:38 2000
+++ lynx2.8.4dev.20/lynx2-8-4/src/chrtrans/makefile.dos Sun May  6 00:35:08 2001
@@ -12,11 +12,11 @@
 CFLAGS = $(MCFLAGS)
 
 CC = gcc
-MCFLAGS = -O1 -DDOSPATH -DNO_TTYTYP \
+MCFLAGS = -O2 -DDOSPATH -DNO_TTYTYP \
 -I. \
 -I../../WWW/Library/Implementation \
--I../../djgpp/watt32/inc \
--I../../djgpp/watt32/inc/sys \
+-I/djgpp/watt32/inc \
+-I/djgpp/watt32/inc/sys \
 -I../..
 
 .SUFFIXES: .tbl
--- lynx2.8.4dev.20/lynx2-8-4/WWW/Library/djgpp/makefile.ori    Mon Feb 14 
20:07:40 2000
+++ lynx2.8.4dev.20/lynx2-8-4/WWW/Library/djgpp/makefile        Sun May  6 
17:59:02 2001
@@ -13,20 +13,38 @@
  -DUSE_HASH \
  -DLINKEDSTYLES
 
+# comment this line to suppress DIRED support
+DIRED_DEFS = -DDIRED_SUPPORT
 
-CFLAGS = -O1 -DUSE_ZLIB -DDOSPATH -DNOUSERS -DDISP_PARTIAL \
--DDIRED_SUPPORT -DSOURCE_CACHE -DUSE_PRETTYSRC \
+CFLAGS= -O2 $(MCFLAGS) $(INTLFLAGS) $(SSLFLAGS) $(SSLINC)
+
+MCFLAGS = \
+ $(DIRED_DEFS) \
  $(ENABLE_COLOR_STYLE) \
--DEXP_FILE_UPLOAD \
--DWATT32 \
--I../Implementation \
--I../../../djgpp/watt32/inc -I../../../djgpp/watt32/inc/sys \
--I../../../src \
--I../../../curses \
--I../../.. $(INTLFLAGS)
+ -DDISP_PARTIAL \
+ -DDOSPATH \
+ -DEXP_FILE_UPLOAD \
+ -DNOUSERS \
+ -DSOURCE_CACHE \
+ -DUSE_PRETTYSRC \
+ -DUSE_ZLIB \
+ -DWATT32 \
+ -I../Implementation \
+ -I../../../src \
+ -I../../.. \
+ -I/djgpp/pdcur24 \
+ -I/djgpp/watt32/inc \
+ -I/djgpp/watt32/inc/sys
+
 LFLAGS =
 CC = gcc
-#INTLFLAGS = -DHAVE_GETTEXT -DHAVE_LIBINTL_H
+
+# Uncomment the following to enable Internationalization.
+#INTLFLAGS = -DHAVE_GETTEXT -DHAVE_LIBINTL_H
+
+# Uncomment the following to enable SSL.
+#SSLFLAGS = -DUSE_SSL
+#SSLINC = -I/djgpp/include/openssl
 
 # Directory for installed binary:
 !BINDIR = /usr/local/bin
--- lynx2.8.4dev.20/WWW/Library/djgpp/CommonMakefile.ori        Sun Mar 26 
19:14:00 2000
+++ lynx2.8.4dev.20/WWW/Library/djgpp/CommonMakefile    Sun May  6 17:52:36 2001
@@ -143,13 +143,12 @@
 
 #      Clean up everything generatable except final products
 clean :
-       rm $(LOB)/*.o
-       -rmdir $(LOB)
+       rm -f $(LOB)/*.o
 
 #      Clean up everything generatable including final products
 
 cleanall : clean
-       rm $(LOB)/libwww.a
+       rm -f $(LOB)/libwww.a
 
 #      Install W3 library into system space (not normally necessary)
 

__ 
Doug Kaufman
Internet: address@hidden


; To UNSUBSCRIBE: Send "unsubscribe lynx-dev" to address@hidden