lynx-dev Revised DOS makefiles [PATCH]

lynx-dev

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

lynx-dev Revised DOS makefiles [PATCH]

From:	Doug Kaufman
Subject:	lynx-dev Revised DOS makefiles [PATCH]
Date:	Sun, 25 Jan 2004 19:10:30 -0800 (PST)

I just compiled and tested the makefile.dsl and redid the makefile.dos
files. The main changed: added "HAVE_POPEN" so the clipboard functions
work and used the "/dev/env" notation for the location of OpenSSL,
watt-32, and pdcurses files (to make them independent of wherever lynx
is being compiled). I also added the lines to enable SSL with Slang.
Since some of the files were redone, I included all the previous changes
I had submitted against 2.8.5pre.3.
                          Doug

--- INSTALLATION.ori    2004-01-24 17:51:04.000000000 -0800
+++ INSTALLATION        2004-01-24 23:18:50.000000000 -0800
@@ -980,11 +980,11 @@
  # define memmove PDC_memmove
  #endif
 
-    If you wish to compile with SSL enabled, you need to get and
-    compile OpenSSL. The DJGPP port has been successfully compiled with
-    the 0.9.7 stable series of OpenSSL. DJGPP can compile OpenSSL from
-    the standard source distribution (http://www.openssl.org/). See the file 
"INSTALL.DJGPP" in
-    the OpenSSL distribution.
+    If you wish to compile with SSL enabled, you need to get and compile
+    OpenSSL. The DJGPP port has been successfully compiled with the
+    0.9.7 stable series of OpenSSL. DJGPP can compile OpenSSL from the
+    standard source distribution (http://www.openssl.org/). See the file
+    "INSTALL.DJGPP" in the OpenSSL distribution.
 
 
     If you have trouble applying the patches, try using the "patch" program,
--- configure.in.ori    2004-01-24 18:16:54.000000000 -0800
+++ configure.in        2004-01-24 21:20:38.000000000 -0800
@@ -237,7 +237,7 @@
        ;;
 msdosdjgpp*)
        LIBS="$LIBS -lwatt"
-       TRY_CFLAGS="$TRY_CFLAGS -DDOSPATH -DNOUSERS -DWATT32"
+       TRY_CFLAGS="$TRY_CFLAGS -DDOSPATH -DNOUSERS"
        ;;
 next*)
        TRY_CFLAGS="$TRY_CFLAGS -DNEXT"
--- www/Library/djgpp/makefile.ori      2001-06-03 11:58:00.000000000 -0800
+++ www/Library/djgpp/makefile  2004-01-25 18:52:06.000000000 -0800
@@ -8,10 +8,7 @@
 #ASIS_MACH = hardware/os
 
 # Use this option to enable optional and *experimental* color style.
-#ENABLE_COLOR_STYLE = \
- -DUSE_COLOR_STYLE \
- -DUSE_HASH \
- -DLINKEDSTYLES
+#ENABLE_COLOR_STYLE = -DUSE_COLOR_STYLE
 
 # comment this line to suppress DIRED support
 DIRED_DEFS = -DDIRED_SUPPORT
@@ -23,18 +20,17 @@
  $(ENABLE_COLOR_STYLE) \
  -DDISP_PARTIAL \
  -DDOSPATH \
- -DEXP_FILE_UPLOAD \
  -DNOUSERS \
- -DSOURCE_CACHE \
+ -DUSE_FILE_UPLOAD \
  -DUSE_PRETTYSRC \
+ -DUSE_SOURCE_CACHE \
  -DUSE_ZLIB \
- -DWATT32 \
  -I../Implementation \
  -I../../../src \
  -I../../.. \
- -I/djgpp/pdcur24 \
- -I/djgpp/watt32/inc \
- -I/djgpp/watt32/inc/sys
+ -I/dev/env/DJDIR/pdcur26 \
+ -I/dev/env/DJDIR/watt32/inc \
+ -I/dev/env/DJDIR/watt32/inc/sys
 
 LFLAGS =
 CC = gcc
@@ -44,7 +40,7 @@
 
 # Uncomment the following to enable SSL.
 #SSLFLAGS = -DUSE_SSL
-#SSLINC = -I/djgpp/include/openssl
+#SSLINC = -I/dev/env/DJDIR/include/openssl
 
 # Directory for installed binary:
 !BINDIR = /usr/local/bin
--- www/Library/djgpp/makefile.sla.ori  2000-02-14 20:07:38.000000000 -0800
+++ www/Library/djgpp/makefile.sla      2004-01-25 16:16:34.000000000 -0800
@@ -7,17 +7,21 @@
 # The ASIS repository's name for the machine we are on
 #ASIS_MACH = hardware/os
 
-CFLAGS = -O1 -DUSE_SLANG -DUSE_ZLIB -DDOSPATH -DNOUSERS -DDISP_PARTIAL \
--DDIRED_SUPPORT -DSOURCE_CACHE -DUSE_PRETTYSRC \
--DWATT32 \
+CFLAGS = -O2 -DUSE_SLANG -DUSE_ZLIB -DDOSPATH -DNOUSERS -DDISP_PARTIAL \
+-DDIRED_SUPPORT -DUSE_SOURCE_CACHE -DUSE_PRETTYSRC \
 -I../Implementation \
--I../../../djgpp/watt32/inc -I../../../djgpp/watt32/inc/sys \
+-I/dev/env/DJDIR/watt32/inc -I/dev/env/DJDIR/watt32/inc/sys \
 -I../../../src \
--I../../.. $(SLANGINC) $(INTLFLAGS)
+-I../../.. $(SLANGINC) $(INTLFLAGS) $(SSLFLAGS) $(SSLINC)
+
 LFLAGS =
 CC = gcc
 #INTLFLAGS = -DHAVE_GETTEXT -DHAVE_LIBINTL_H
 
+# Uncomment the following to enable SSL.
+#SSLFLAGS = -DUSE_SSL
+#SSLINC = -I/dev/env/DJDIR/include/openssl
+
 # Directory for installed binary:
 !BINDIR = /usr/local/bin
 
--- www/Library/djgpp/CommonMakefile.ori        2001-06-03 11:58:00.000000000 
-0800
+++ www/Library/djgpp/CommonMakefile    2004-01-24 19:00:16.000000000 -0800
@@ -69,7 +69,7 @@
 # XMOsAIC hack is only for server to cope with xmosaic kludge for mmedia
 #
 # add -DNEW_GATEWAY here for the new gateway config stuff
-CFLAGS2 = $(CFLAGS) $(LYFLAGS) $(WAISCFLAGS) -I$(CMN) -DXMOSAIC_HACK 
-DACCESS_AUTH
+CFLAGS2 = $(CFLAGS) $(LYFLAGS) $(WAISCFLAGS) -I$(CMN) -DACCESS_AUTH
 
 CERNLIBBIN = $(WWW)/bin
 
--- src/chrtrans/makefile.dos.ori       2004-01-07 18:03:08.000000000 -0800
+++ src/chrtrans/makefile.dos   2004-01-25 17:32:34.000000000 -0800
@@ -12,11 +12,11 @@
 CFLAGS = $(MCFLAGS)
 
 CC = gcc
-MCFLAGS = -O2 -DDOSPATH -DNO_TTYTYP \
+MCFLAGS = -O2 -DDOSPATH \
 -I. \
 -I../../WWW/Library/Implementation \
--I/djgpp/watt32/inc \
--I/djgpp/watt32/inc/sys \
+-I/dev/env/DJDIR/watt32/inc \
+-I/dev/env/DJDIR/watt32/inc/sys \
 -I../..
 
 .SUFFIXES: .tbl
--- src/chrtrans/makeuctb.c.ori 2004-01-07 18:03:08.000000000 -0800
+++ src/chrtrans/makeuctb.c     2004-01-24 19:23:30.000000000 -0800
@@ -887,4 +887,5 @@
     }
 
     done(EX_OK);
+return 0;
 }
--- src/makefile.dos.ori        2004-01-24 17:51:04.000000000 -0800
+++ src/makefile.dos    2004-01-25 17:45:02.000000000 -0800
@@ -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= -O2 $(MCFLAGS) $(INTLFLAGS) -I. -I.. $(SLANGINC)
+CFLAGS= -O2 $(MCFLAGS) $(INTLFLAGS) -I. -I..
 
 # comment this line to suppress DIRED support
 DIRED_DEFS = \
@@ -21,8 +21,7 @@
  -DOK_OVERRIDE
 
 # Use this option to enable optional and *experimental* color style.
-#ENABLE_COLOR_STYLE = \
- -DUSE_COLOR_STYLE
+#ENABLE_COLOR_STYLE = -DUSE_COLOR_STYLE
 
 CC = gcc
 
@@ -36,41 +35,41 @@
  -DEXP_ADDRLIST_PAGE \
  -DEXP_ALT_BINDINGS \
  -DEXP_NESTED_TABLES \
- -DUSE_PERSISTENT_COOKIES \
  -DFANCY_CURSES \
+ -DHAVE_POPEN \
  -DNOUSERS \
  -DNO_CUSERID \
  -DNO_TTYTYPE \
  -DNO_UTMP \
  -DPDCURSES \
- -DUSE_SOURCE_CACHE \
  -DUSE_EXTERNALS \
  -DUSE_FILE_UPLOAD \
+ -DUSE_PERSISTENT_COOKIES \
  -DUSE_PRETTYSRC \
+ -DUSE_SOURCE_CACHE \
  -DUSE_ZLIB \
- -DWATT32 \
  $(SSLFLAGS) \
  $(SSLINC) \
  -I./chrtrans \
  -I../WWW/Library/Implementation \
- -I/djgpp/pdcur26 \
- -I/djgpp/watt32/inc \
- -I/djgpp/watt32/inc/sys
+ -I/dev/env/DJDIR/pdcur26 \
+ -I/dev/env/DJDIR/watt32/inc \
+ -I/dev/env/DJDIR/watt32/inc/sys
 
 WWWLIB = \
  ../WWW/Library/djgpp/libwww.a \
- /djgpp/pdcur26/lib/pdcurses.a
+ /dev/env/DJDIR/pdcur26/lib/pdcurses.a
 
-LIBS= -L/djgpp/watt32/lib -lwatt -lz -lwmemu
+LIBS= -L/dev/env/DJDIR/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.
+# Uncomment the following to enable SSL.
 #SSLFLAGS = -DUSE_SSL
 #SSLLIB = -lssl -lcrypto
-#SSLINC = -I/djgpp/include/openssl
+#SSLINC = -I/dev/env/DJDIR/include/openssl
 
 all: lynx
 
--- src/makefile.dsl.ori        2004-01-07 18:03:08.000000000 -0800
+++ src/makefile.dsl    2004-01-25 17:23:44.000000000 -0800
@@ -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 = \
@@ -28,6 +28,7 @@
  -DDISP_PARTIAL \
  -DDJGPP_KEYHANDLER \
  -DDOSPATH \
+ -DHAVE_POPEN \
  -DNOUSERS \
  -DNO_CUSERID \
  -DNO_TTYTYPE \
@@ -37,18 +38,27 @@
  -DUSE_SLANG \
  -DUSE_SOURCE_CACHE \
  -DUSE_ZLIB \
- -DWATT32 \
+ $(SSLFLAGS) \
+ $(SSLINC) \
  -I./chrtrans \
  -I../WWW/Library/Implementation \
- -I../djgpp/watt32/inc \
- -I../djgpp/watt32/inc/sys
+ -I/dev/env/DJDIR/watt32/inc \
+ -I/dev/env/DJDIR/watt32/inc/sys
 
 WWWLIB = \
  ../WWW/Library/djgpp/libwww.a \
- ../djgpp/watt32/lib/libwatt.a
+ /dev/env/DJDIR/watt32/lib/libwatt.a
 
-LIBS= $(SLANGLIB) -lslang -lz # -lintl
+LIBS= $(SLANGLIB) -lslang $(SSLLIB) -lz $(INTLLIBS)
+
+# Uncomment the following to enable Internationalization.
 #INTLFLAGS = -DHAVE_GETTEXT -DHAVE_LIBINTL_H
+#INTLLIBS= -lintl -liconv
+
+# Uncomment the following to enable SSL.
+#SSLFLAGS = -DUSE_SSL
+#SSLLIB = -lssl -lcrypto
+#SSLINC = -I/dev/env/DJDIR/include/openssl
 
 all: lynx.exe
 

-- 
Doug Kaufman
Internet: address@hidden



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

[Prev in Thread]

Current Thread

[Next in Thread]

lynx-dev Revised DOS makefiles [PATCH], Doug Kaufman <=
- Re: lynx-dev Revised DOS makefiles [PATCH], Gisle Vanem, 2004/01/26
  - Re: lynx-dev Revised DOS makefiles [PATCH], Doug Kaufman, 2004/01/26
    - Re: lynx-dev Revised DOS makefiles [PATCH], Leonid Pauzner, 2004/01/27
    - Re: lynx-dev Revised DOS makefiles [PATCH], Thomas Dickey, 2004/01/27

Prev by Date: lynx-dev lynx2.8.5pre.3a.patch.gz
Next by Date: lynx-dev Permissions of files installed by install-doc
Previous by thread: lynx-dev lynx2.8.5pre.3a.patch.gz
Next by thread: Re: lynx-dev Revised DOS makefiles [PATCH]
Index(es):
- Date
- Thread