LYNX-DEV More DOS patches for development code ac-0.87

[Doug Kaufman]

I believe that the consensus of the discussion was that zlib should be
incorporated by default in the DOS binary, but the zlib changes aren't in
the current makefiles.  It is probably easier to remove the zlib
references if zlib is not desired, than for someone compiling in DOS to
determine what needs to be added if they desire zlib.  The following patch
puts zlib back in.

The ALT_CHAR_SET define doesn't have much functionality for DOS, but
removes the warnings about redefining BOXHORI and BOXVERT due to the
conflicts between userdefs.h and LYCurses.h.  NCURSES_VERSION only seems
to apply for DOS when ALT_CHAR_SET is also defined.  I included them in
the patch, but they can probably be removed when the conflict between the
two header files is resolved.

The makefile for dos for libwww.a has never worked without first creating
a "created" file.  Since this is a test for the existence of the directory
and since the DOS makefile is only executed from within that directory, I
have removed the test.  With these changes, the DOS executable should be
able to be compiled by 1) doing "make" from within
lynx2-7-1/WWW/Library/djgpp, 2) doing "make -f makefile.dos" from  within
lynx2-7-1/src/chrtrans, and 3) doing "make -f makefile.dos" from within
lynx2-7-1/src.

I  would still like to see changes in lynx.cfg or userdefs.h, either
automatically changing names of key files or warning DOS users of changes
needed to make them comply with the 8+3 limitations.  I am thinking
specifically about files such as lynx.rc, lynx.sig, _mime.typ, _mailcap.
The most important is lynx.rc, since if it is left as .lynxrc, lynx is
unable to save the options file under DOS.

                              Doug

*** lynx2-7-1/WWW/Library/djgpp/makefile        Wed Oct 22 12:02:42 1997
--- lynx2-7-1/WWW/Library/djgpp/makefile.new    Sat Oct 25 16:33:26 1997
***************
*** 7,13 ****
  # The ASIS repository's name for the machine we are on
  #ASIS_MACH = hardware/os
  
! CFLAGS = -O3 -DEXP_CHARTRANS -DDOSPATH -DNOUSERS -DDEBUG 
-I../../../djgpp/tcplib/include -I../../../djgpp/tcplib/include/tcp \
  -I../../../src -I../../..
  LFLAGS =
  CC = gcc
--- 7,13 ----
  # The ASIS repository's name for the machine we are on
  #ASIS_MACH = hardware/os
  
! CFLAGS = -O3 -DUSE_ZLIB -DEXP_CHARTRANS -DDOSPATH -DNOUSERS -DDEBUG 
-I../../../djgpp/tcplib/include -I../../../djgpp/tcplib/include/tcp \
  -I../../../src -I../../..
  LFLAGS =
  CC = gcc
*** lynx2-7-1/WWW/Library/djgpp/CommonMakefile  Thu Aug  7 06:26:14 1997
--- lynx2-7-1/WWW/Library/djgpp/CommonMakefile.new      Sun Oct 26 10:42:36 1997
***************
*** 146,152 ****
  
  #     Clean up everything generatable except final products
  clean :
!       rm $(LOB)/*.o $(LOB)/created
        -rmdir $(LOB)
  
  #     Clean up everything generatable including final products
--- 146,152 ----
  
  #     Clean up everything generatable except final products
  clean :
!       rm $(LOB)/*.o 
        -rmdir $(LOB)
  
  #     Clean up everything generatable including final products
***************
*** 212,226 ****
  #                     Common code
  #                     -----------
  
! #     Directory for object files - created checks it exists
! 
! OE = $(LOB)/created
! $(OE) :
!       if [ ! -r $(WTMP) ] ; then mkdir $(WTMP); else echo OK ; fi
!       if [ ! -r $(WTMP)/Library ] ; then mkdir $(WTMP)/Library; else echo OK 
; fi
!       if [ ! -r $(WTMP)/Library/$(WWW_MACH) ] ; \
!               then mkdir $(WTMP)/Library/$(WWW_MACH); else echo OK ; fi
!       touch $@
  
  $(LOB)/HTList.o : $(OE) $(CMN)HTList.c $(CMN)HTUtils.h $(CMN)HTList.h
        $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTList.c
--- 212,218 ----
  #                     Common code
  #                     -----------
  
! #     Directory for object files
  
  $(LOB)/HTList.o : $(OE) $(CMN)HTList.c $(CMN)HTUtils.h $(CMN)HTList.h
        $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTList.c
*** lynx2-7-1/src/makefile.dos  Sun Aug 17 17:24:02 1997
--- lynx2-7-1/src/makefile.dos.new      Sun Oct 26 10:27:06 1997
***************
*** 12,20 ****
  CFLAGS= $(MCFLAGS) -I.. $(SLANGINC)
  
  CC = gcc
! MCFLAGS = -O3 -DUSE_EXTERNALS -DNCURSES_VERSION -DEXP_CHARTRANS 
-DCOLOR_CURSES -DNCURSES -DFANCY_CURSES -DACCESS_AUTH -DNO_CUSERID -DNOUSERS 
-DDOSPATH -DNO_TTYTYPE -DNO_UTMP -I../WWW/library/implementation -I../curses  
-I../djgpp/tcplib/include -I../djg
pp/tcplib/include/tcp
  WWWLIB = ../WWW/library/djgpp/libwww.a ../curses/pdcurses.a 
../djgpp/tcplib/obj/libtcp.a
! CHRTR= chrtrans/
  
  all: lynx
  
--- 12,20 ----
  CFLAGS= $(MCFLAGS) -I.. $(SLANGINC)
  
  CC = gcc
! MCFLAGS = -O3 -DALT_CHAR_SET -DUSE_ZLIB -DUSE_EXTERNALS -DNCURSES_VERSION 
-DEXP_CHARTRANS -DCOLOR_CURSES -DNCURSES -DFANCY_CURSES -DACCESS_AUTH 
-DNO_CUSERID -DNOUSERS -DDOSPATH -DNO_TTYTYPE -DNO_UTMP 
-I../WWW/library/implementation -I../curses  -I../djg
pp/tcplib/include -I../djgpp/tcplib/include/tcp
  WWWLIB = ../WWW/library/djgpp/libwww.a ../curses/pdcurses.a 
../djgpp/tcplib/obj/libtcp.a
! LIBS=-lz
  
  all: lynx
  


__
Doug Kaufman
Internet: address@hidden (preferred)
          address@hidden

;
; To UNSUBSCRIBE:  Send a mail message to address@hidden
;                  with "unsubscribe lynx-dev" (without the
;                  quotation marks) on a line by itself.
;