diff options
| author | Thomas E. Dickey <dickey@invisible-island.net> | 1998-03-18 12:12:19 -0500 |
|---|---|---|
| committer | Thomas E. Dickey <dickey@invisible-island.net> | 1998-03-18 12:12:19 -0500 |
| commit | d8e8363bb47d88e434c2128c4c1ffbf501a67898 (patch) | |
| tree | af03af9eef872e7b81ac815a702c992f2c4e1977 | |
| parent | 88a8487639527e04313c7c87f390e7a45f7c529a (diff) | |
| download | lynx-snapshots-d8e8363bb47d88e434c2128c4c1ffbf501a67898.tar.gz | |
snapshot of project "lynx", label v2-8-1dev_2
43 files changed, 184 insertions, 2295 deletions
diff --git a/CHANGES b/CHANGES new file mode 100644 index 00000000..96645ced --- /dev/null +++ b/CHANGES @@ -0,0 +1,20 @@ +Changes since Lynx 2.8 release +================================================================================ + +1998-03-18 (2.8.1dev.1) +* correct an ifdef that caused inconsistent pathname separators on Windows + (reported by afn, patch by DK). +* correct a missing AC_MSG_RESULT in configure.in (also MM) - TD +* guard against illegal (e.g., zero) value for DEFAULT_CACHE_SIZE, when it is + read from lynx.cfg (reported by Martin Mokrejs + <mmokrejs@prfdec.natur.cuni.cz>) - TD +* implement simple 'include' facility for lynx.cfg - BL +* change TagClass and TagFlags to #define's to accommodate older compilers + which do not accept initialization of enums from data that do not correspond + to the declared values, e.g., CLIX (which complains) and Apollo (which fails + to compile, reported by Dave Eaton). - TD +* remove some obsolete definitions from userdefs.h, tcp.h and HTUtils.h - TD +* remove obsolete files from WWW/Library - TD +1998-03-12 +* UPPER8: a separate function HTMLSetDisplayCharsetMatchLocale() introduced + (LYCharSets.c). Locale mismatch assumed for DOS/WINDOWS display charsets. - LP diff --git a/INSTALLATION b/INSTALLATION index 61efdf8d..86b39aad 100644 --- a/INSTALLATION +++ b/INSTALLATION @@ -219,8 +219,9 @@ II. Compile instructions -- UNIX Use this option to disable "Up-to" parent-links in directory listings. --enable-8bit-toupper (define EXP_8BIT_TOUPPER) - use experimental 8-bit case-conversion, e.g., for case-insensitive - searches in non-ASCII character set. + Use experimental 8-bit case-conversion, e.g., for case-insensitive + searches in non-ASCII display character set, this overrides locale + settings. --enable-color-style (define USE_COLOR_STYLE) Use this option to enable optional and *experimental* color style. diff --git a/README b/README index acb937de..8d46bb83 100644 --- a/README +++ b/README @@ -3,9 +3,9 @@ Lynx Version 2.8 is the latest "official" release. This release is based on the lynx2.7.1ac-0.118 development code set, and includes bug fixes through -March 8, 1998. See the CHANGES2.8 file in the docs subdirectory for a complete -record of all changes and bug fixes in this release. New releases are -announced on the lynx-dev mailing list (see below). +March 10, 1998. See the CHANGES2.8 file in the docs subdirectory for a +complete record of all changes and bug fixes in this release. New releases +are announced on the lynx-dev mailing list (see below). WHAT IS LYNX? diff --git a/WWW/Library/Implementation/BSDI_Makefile b/WWW/Library/Implementation/BSDI_Makefile deleted file mode 100644 index 21ff1c02..00000000 --- a/WWW/Library/Implementation/BSDI_Makefile +++ /dev/null @@ -1,405 +0,0 @@ -# Make WWW under unix -# - -# For W3 distribution, machine type for subdirectories -WWW_MACH = unix - -# The ASIS repository's name for the machine we are on -ASIS_MACH = generic/unix - - -CFLAGS = -O -DDEBUG -DUSE_DIRENT -DSVR4 -DNO_FILIO_H -LFLAGS = -CC = cc - -# Directory for installed binary: -BINDIR = /usr/local/bin - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -# Where is the W3 object library? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -# Common Makefile for W3 Library Code -# ----------------------------------- -# -# (c) CERN 1990, 1991 -- see Copyright.html for conditions -# -# This file should be invariant between systems. -# DEPENDENCIES NOT COMPLETE @@ -# -# make Compile and link the software (private version) -# make install Copy it into the system (implies make) -# make update Copy installed version into installed version -# make uninstall Unlink installed version from the system -# make clean Remove intermediate files -# make cleanall Remove intremediate files and products -# -# Macros required to be defined already for make: -# -# CC The C compiler -# CFLAGS Flags for $(CC) -- except the -I which are below -# LFLAGS Flags for ld -# LYFLAGS Flags for Lynx -# -# WWW The WWW source tree directory -# -# Macros needed for make install: -# -# LIBDIR Directory for installed library -#______________________________________________________________________ - -# If this env var is set to something else Some makes will use that instead -SHELL = /bin/sh - -# .h files are distributed but originally are made from the -# self-documenting hypertext files. - -.SUFFIXES: .h .html -.html.h: -# - chmod +w $*.h - www -w90 -na -to text/x-c $*.html > $*.h -# chmod -w $*.h - -# If this is actually run in a subdirectory, -# -# WWW = ../../.. -# WWW = ../.. For [cernlib] build in this directory - -WC = $(WWW)/Library -CMN = $(WWW)/Library/Implementation/ -VMS = $(CMN)vms -# Where shall we put the objects and built library? - -LOB = $(WTMP)/Library/$(WWW_MACH) - -# Only needed if HTWAIS.c is to be compiled. Put into your Makefile.include -# uncomment these and fill in WAISINC for adding direct wais access -# to Lynx. -#HTWAIS = $(LOB)/HTWAIS.o -#WAIS = YES -#WAISINC = -I../../../../freeWAIS-0.202/ir -#WAISCFLAGS = -DDIRECT_WAIS -# - -# This path, if relative, is taken relative to the directory -# in which this makefile is, not the pwd. This screws up the -# recursive invocation -# include $(CMN)Version.make -VC = 2.14 - -# 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 - -CERNLIBBIN = $(WWW)/bin - -COMMON = $(LOB)/HTParse.o $(LOB)/HTAccess.o $(LOB)/HTTP.o \ - $(LOB)/HTFile.o $(LOB)/HTBTree.o $(LOB)/HTFTP.o $(LOB)/HTTCP.o \ - $(LOB)/SGML.o $(LOB)/HTMLDTD.o $(LOB)/HTChunk.o \ - $(LOB)/HTPlain.o $(LOB)/HTWriter.o \ - $(LOB)/HTMLGen.o \ - $(LOB)/HTAtom.o $(LOB)/HTAnchor.o $(LOB)/HTStyle.o \ - $(LOB)/HTList.o $(LOB)/HTString.o \ - $(LOB)/HTRules.o $(LOB)/HTFormat.o $(LOB)/HTMIME.o \ - $(LOB)/HTHistory.o $(LOB)/HTNews.o $(LOB)/HTGopher.o \ - $(LOB)/HTTelnet.o $(LOB)/HTFinger.o $(LOB)/HTWSRC.o $(HTWAIS) \ - $(LOB)/HTAAUtil.o $(LOB)/HTAAServ.o $(LOB)/HTAABrow.o \ - $(LOB)/HTAAFile.o $(LOB)/HTPasswd.o $(LOB)/HTGroup.o \ - $(LOB)/HTACL.o $(LOB)/HTAuth.o $(LOB)/HTAAProt.o \ - $(LOB)/HTAssoc.o $(LOB)/HTLex.o $(LOB)/HTUU.o - -CFILES = $(CMN)HTParse.c $(CMN)HTAccess.c $(CMN)HTTP.c $(CMN)HTFile.c \ - $(CMN)HTBTree.c \ - $(CMN)HTFTP.c $(CMN)HTTCP.c $(CMN)SGML.c \ - $(CMN)HTMLDTD.c \ - $(CMN)HTPlain.c $(CMN)HTWriter.c \ - $(CMN)HTMLGen.c \ - $(CMN)HTChunk.c $(CMN)HTAtom.c $(CMN)HTAnchor.c $(CMN)HTStyle.c \ - $(CMN)HTList.c $(CMN)HTString.c $(CMN)HTRules.c \ - $(CMN)HTFormat.c $(CMN)HTMIME.c $(CMN)HTHistory.c \ - $(CMN)HTNews.c $(CMN)HTGopher.c $(CMN)HTTelnet.c \ - $(CMN)HTFinger.c $(CMN)HTWAIS.c $(CMN)HTWSRC.c \ - $(CMN)HTAAUtil.c $(CMN)HTAAServ.c $(CMN)HTAABrow.c \ - $(CMN)HTAAFile.c $(CMN)HTPasswd.c $(CMN)HTGroup.c \ - $(CMN)HTACL.c $(CMN)HTAuth.c $(CMN)HTAAProt.c \ - $(CMN)HTAssoc.c $(CMN)HTLex.c $(CMN)HTUU.c - -HFILES = $(CMN)HTParse.h $(CMN)HTAccess.h $(CMN)HTTP.h $(CMN)HTFile.h \ - $(CMN)HTBTree.h $(CMN)HTFTP.h $(CMN)HTTCP.h \ - $(CMN)SGML.h $(CMN)HTML.h $(CMN)HTMLDTD.h $(CMN)HTChunk.h \ - $(CMN)HTPlain.h $(CMN)HTWriter.h \ - $(CMN)HTFWriter.h $(CMN)HTMLGen.h \ - $(CMN)HTStream.h \ - $(CMN)HTAtom.h $(CMN)HTAnchor.h $(CMN)HTStyle.h \ - $(CMN)HTList.h \ - $(CMN)HTString.h $(CMN)HTAlert.h $(CMN)HTRules.h \ - $(CMN)HTFormat.h $(CMN)HTInit.h \ - $(CMN)HTMIME.h $(CMN)HTHistory.h $(CMN)HTNews.h \ - $(CMN)HTGopher.h \ - $(CMN)HTUtils.h $(CMN)tcp.h $(CMN)HText.h \ - $(CMN)HTTelnet.h $(CMN)HTFinger.h \ - $(CMN)HTWAIS.h $(CMN)HTWSRC.h \ - $(CMN)HTAAUtil.h $(CMN)HTAAServ.h $(CMN)HTAABrow.h \ - $(CMN)HTAAFile.h $(CMN)HTPasswd.h $(CMN)HTGroup.h \ - $(CMN)HTACL.h $(CMN)HTAuth.h $(CMN)HTAAProt.h \ - $(CMN)HTAssoc.h $(CMN)HTLex.h $(CMN)HTUU.h - -SOURCES = $(CFILES) $(HFILES) $(CMN)Version.make \ - $(CMN)CommonMakefile $(CMN)Makefile \ - $(WWW)/README.txt $(WWW)/Copyright.txt $(WWW)/BUILD $(WWW)/Makefile -SPECIFIC = $(WWW)/All/*/Makefile.include $(WWW)/All/Implementation/Makefile* \ - $(VMS)/descrip.mms $(VMS)/build_multinet.com \ - $(VMS)/COPYING.LIB $(VMS)/setup.com $(VMS)/multinet.opt \ - $(VMS)/patchlevel.h $(VMS)/ufc-crypt.h \ - $(VMS)/crypt.c $(VMS)/crypt_util.c \ - $(VMS)/getline.c $(VMS)/getpass.c \ - $(VMS)/HTVMSUtils.h $(VMS)/HTVMSUtils.c - - -# Library -# -# On SGI, ranlib is unnecessary and does not exist so we ignore errors -# for that step -$(LOB)/libwww.a : $(COMMON) - ar r $(LOB)/libwww.a $(COMMON) - -ranlib $(LOB)/libwww.a - -# Clean up everything generatable except final products -clean : - rm $(LOB)/*.o $(LOB)/.created - -rmdir $(LOB) - -# Clean up everything generatable including final products - -cleanall : clean - rm $(LOB)/libwww.a - -# Install W3 library into system space (not normally necessary) - -install : libwww.a - if [ ! -r $(LIBDIR) ] mkdir $(LIBDIR) - cp libwww.a $(LIBDIR)/libwww.a - -uninstall : - rm $(LIBDIR)/libwww.a - -# Distribution use only: -# ---------------------- - -# Needs www version 2.4 or later to do this -inc : $(HFILES) - echo Include files generated from hypertext. - -binary : /pub/www/bin/$(WWW_MACH)/libwww_$(VC).a - echo FTP archive binary Libray $(VC) for $(WWW_MACH) up to date. - - -/pub/www/bin/$(WWW_MACH)/libwww_$(VC).a : libwww.a - -mkdir /pub/www/bin/$(WWW_MACH) - cp libwww.a /pub/www/bin/$(WWW_MACH)/libwww_$(VC).a - -# Source Distribution: - -distribute : /pub/www/README.txt /pub/www/Copyright.txt - (cd $(WWW)/..; WWW=WWW ABS=`pwd`/ make $(MFLAGS) \ - -f WWW/Library/Implementation/CommonMakefile \ - /pub/www/src/WWWLibrary_$(VC).tar.Z) - (cd ../Implementation; cvs tag \ - `sed -e 's/VC = /v/' Version.make | sed -e 's?\.?/?'` ) - echo Distribution of Library version $(VC) up to date. - -/pub/www/src/WWWLibrary_$(VC).tar.Z : $(SOURCES) - tar cf /pub/www/src/WWWLibrary_$(VC).tar \ - $(SOURCES) $(SPECIFIC) $(WC)/*/Makefile - compress /pub/www/src/WWWLibrary_$(VC).tar - - -# Hypertext supplied in text format -# --------------------------------- - -$(WWW)/README.txt : $(WWW)/../README.html - www -n -p66 http://www.w3.org/hypertext/README.html \ - > $(WWW)/README.txt -/pub/www/README.txt : $(WWW)/README.txt - cp $(WWW)/README.txt /pub/www/README.txt - -$(WWW)/Copyright.txt : $(WWW)/../Copyright.html - www -n -p66 http://www.w3.org/hypertext/Copyright.html \ - > $(WWW)/Copyright.txt -/pub/www/Copyright.txt : $(WWW)/Copyright.txt - cp $(WWW)/Copyright.txt /pub/www/Copyright.txt - -# 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 - -$(LOB)/HTAnchor.o : $(OE) $(CMN)HTAnchor.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAnchor.c - -$(LOB)/HTFormat.o : $(OE) $(CMN)HTFormat.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFormat.c - -$(LOB)/HTMIME.o : $(OE) $(CMN)HTMIME.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMIME.c - -$(LOB)/HTHistory.o : $(OE) $(CMN)HTHistory.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTHistory.c - -$(LOB)/HTNews.o : $(OE) $(CMN)HTNews.c $(CMN)HTUtils.h $(CMN)HTList.h\ - $(CMN)HTMLDTD.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTNews.c - -$(LOB)/HTGopher.o : $(OE) $(CMN)HTGopher.c $(CMN)HTUtils.h $(CMN)HTList.h \ - $(CMN)HTMLDTD.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTGopher.c - -$(LOB)/HTTelnet.o : $(OE) $(CMN)HTTelnet.c $(CMN)HTUtils.h $(CMN)HTTelnet.h $(CMN)../../../userdefs.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTelnet.c - -$(LOB)/HTFinger.o : $(OE) $(CMN)HTFinger.c $(CMN)HTUtils.h $(CMN)HTList.h \ - $(CMN)HTMLDTD.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFinger.c - -$(LOB)/HTStyle.o : $(OE) $(CMN)HTStyle.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTStyle.c - -$(LOB)/HTAtom.o : $(OE) $(CMN)HTAtom.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAtom.c - -$(LOB)/HTChunk.o : $(OE) $(CMN)HTChunk.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTChunk.c - -$(LOB)/HTString.o : $(OE) $(CMN)HTString.c $(CMN)HTUtils.h $(CMN)Version.make - $(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTString.c - -$(LOB)/HTRules.o : $(OE) $(CMN)HTRules.c $(CMN)HTUtils.h $(CMN)Version.make \ - $(CMN)HTAAServ.h $(CMN)HTAAProt.h - $(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTRules.c - -$(LOB)/SGML.o : $(OE) $(CMN)SGML.c $(CMN)HTUtils.h $(CMN)UCAux.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)SGML.c - -$(LOB)/HTMLGen.o : $(OE) $(CMN)HTMLGen.c $(CMN)HTUtils.h $(CMN)HTMLDTD.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMLGen.c - -$(LOB)/HTMLDTD.o : $(OE) $(CMN)HTMLDTD.c $(CMN)SGML.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMLDTD.c - -$(LOB)/HTPlain.o : $(OE) $(CMN)HTPlain.c $(CMN)HTPlain.h $(CMN)HTStream.h \ - $(CMN)UCAux.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTPlain.c - -$(LOB)/HTWAIS.o : $(OE) $(CMN)HTWAIS.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(WAISINC) $(CMN)HTWAIS.c - -$(LOB)/HTWSRC.o : $(OE) $(CMN)HTWSRC.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTWSRC.c - -$(LOB)/HTWriter.o : $(OE) $(CMN)HTWriter.c $(CMN)HTWriter.h $(CMN)HTStream.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTWriter.c - - -# Access Authorization - -$(LOB)/HTAAUtil.o : $(OE) $(CMN)HTAAUtil.c $(CMN)HTAAUtil.h \ - $(CMN)HTUtils.h $(CMN)HTString.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAAUtil.c - -$(LOB)/HTAAFile.o : $(OE) $(CMN)HTAAFile.c $(CMN)HTAAFile.h \ - $(CMN)HTAAUtil.h $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAAFile.c - -$(LOB)/HTPasswd.o : $(OE) $(CMN)HTPasswd.c $(CMN)HTPasswd.h \ - $(CMN)HTAAUtil.h $(CMN)HTAAFile.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTPasswd.c - -$(LOB)/HTGroup.o : $(OE) $(CMN)HTGroup.c $(CMN)HTGroup.h \ - $(CMN)HTAAUtil.h $(CMN)HTAAFile.h \ - $(CMN)HTAssoc.h $(CMN)HTLex.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTGroup.c - -$(LOB)/HTACL.o : $(OE) $(CMN)HTACL.c $(CMN)HTACL.h \ - $(CMN)HTAAUtil.h $(CMN)HTAAFile.h $(CMN)HTGroup.h \ - $(CMN)HTAssoc.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTACL.c - -$(LOB)/HTAuth.o : $(OE) $(CMN)HTAuth.c $(CMN)HTAuth.h \ - $(CMN)HTAAUtil.h $(CMN)HTPasswd.h $(CMN)HTAAFile.h \ - $(CMN)HTAssoc.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAuth.c - -$(LOB)/HTAAServ.o : $(OE) $(CMN)HTAAServ.c $(CMN)HTAAServ.h \ - $(CMN)HTAAUtil.h $(CMN)HTAAFile.h $(CMN)HTPasswd.h \ - $(CMN)HTGroup.h $(CMN)HTACL.h $(CMN)HTAuth.h \ - $(CMN)HTUU.h $(CMN)HTParse.h $(CMN)HTList.h \ - $(CMN)HTUtils.h $(CMN)HTString.h $(CMN)HTRules.h \ - $(CMN)HTAAProt.h $(CMN)HTAssoc.h $(CMN)HTLex.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAAServ.c - -$(LOB)/HTAABrow.o : $(OE) $(CMN)HTAABrow.c $(CMN)HTAABrow.h \ - $(CMN)HTAAUtil.h $(CMN)HTUU.h \ - $(CMN)HTUtils.h $(CMN)HTString.h \ - $(CMN)HTParse.h $(CMN)HTList.h $(CMN)HTAlert.h \ - $(CMN)HTAssoc.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAABrow.c - -$(LOB)/HTAAProt.o : $(OE) $(CMN)HTAAProt.c $(CMN)HTAAProt.h \ - $(CMN)HTUtils.h $(CMN)HTAAUtil.h $(CMN)HTAAFile.h \ - $(CMN)HTAssoc.h $(CMN)HTLex.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAAProt.c - -$(LOB)/HTAssoc.o : $(OE) $(CMN)HTAssoc.c $(CMN)HTAssoc.h \ - $(CMN)HTUtils.h $(CMN)HTString.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAssoc.c - -$(LOB)/HTLex.o : $(OE) $(CMN)HTLex.c $(CMN)HTLex.h $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTLex.c - -$(LOB)/HTUU.o : $(OE) $(CMN)HTUU.c $(CMN)HTUU.h $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTUU.c - - -# Communications & Files - -$(LOB)/HTTP.o : $(OE) $(CMN)HTTP.c $(CMN)HTUtils.h $(CMN)HTAABrow.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTP.c - -$(LOB)/HTTCP.o : $(OE) $(CMN)HTTCP.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTCP.c - -$(LOB)/HTFile.o : $(OE) $(CMN)HTFile.c $(CMN)HTUtils.h \ - $(CMN)HTMLDTD.h $(CMN)HTAAServ.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFile.c - -$(LOB)/HTBTree.o : $(OE) $(CMN)HTBTree.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTBTree.c - -$(LOB)/HTFTP.o : $(OE) $(CMN)HTFTP.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFTP.c - -$(LOB)/HTAccess.o : $(OE) $(CMN)HTAccess.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAccess.c - -$(LOB)/HTParse.o : $(OE) $(CMN)HTParse.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTParse.c - diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h index 21128bb9..9e7ea323 100644 --- a/WWW/Library/Implementation/HTUtils.h +++ b/WWW/Library/Implementation/HTUtils.h @@ -31,78 +31,6 @@ /* FIXME: these will be removed after completing auto-configure script */ -#ifdef _IBMR2 -#define USE_DIRENT /* sys V style directory open */ -#endif /* _IBMR2 */ - -#ifdef _SYSV3 -#include <fcntl.h> -#define USE_DIRENT /* sys V style directory open */ -#endif /* _SYSV3 */ - -/* Solaris. */ -#if defined(sun) && defined(__svr4__) && !defined(USE_DIRENT) -#define USE_DIRENT /* sys V style directory open */ -#endif /* sun && __svr4__ && !USE_DIRENT */ - -#ifdef __alpha -#define USE_DIRENT -#endif /* __alpha */ - -#ifndef USE_DIRENT -#ifdef SVR4 -#define USE_DIRENT -#endif /* SVR4 */ -#endif /* !USE_DIRENT */ - -#ifndef SOLARIS2 -#include <string.h> /* For bzero etc */ -#endif /* !SOLARIS2 */ - -#ifdef SCO -#define sco -#endif /* SCO */ -#ifdef sco -#include <sys/fcntl.h> -#define USE_DIRENT -#endif /* sco */ - -/* -Intergraph CLIX - */ -#ifdef CLIX -#include <sys/fcntl.h> -#define USE_DIRENT -#endif /* CLIX */ - -#ifdef ISC -#ifndef NO_UNISTD_H -#include <sys/unistd.h> -#endif /* !NO_UNISTD_H */ -#else -#if !defined(NO_UNISTD_H) && !defined(VMS) -#include <unistd.h> -#endif /* !NO_UNISTD_H && !VMS */ -#endif /* ISC */ - -#if defined(SVR4) || defined(UNIXWARE) -#include <sys/fcntl.h> -#ifndef NO_FILIO_H /* BSD Interactive doesn't have filio.h. */ -#include <sys/filio.h> -#endif /* !NO_FILIO_H */ -#endif /* SVR4 || UNIXWARE */ - -/* -SOLARIS 2 - */ -#ifdef SOLARIS2 -#include <sys/filio.h> -#endif /* SOLARIS2 */ - -#ifndef NO_FILIO_H -#define NO_FILIO_H /* prevent conflict between autoconf & BSDI make */ -#endif - /* Accommodate pre-autoconf Makefile */ #ifndef NO_CBREAK diff --git a/WWW/Library/Implementation/SGML.h b/WWW/Library/Implementation/SGML.h index 09ff6fe9..b30a8230 100644 --- a/WWW/Library/Implementation/SGML.h +++ b/WWW/Library/Implementation/SGML.h @@ -8,10 +8,10 @@ to functions which are called to implement the actual effect of the text read. When these functions are called, the attribute structures pointed to by the - DTD are valid, and the function is passed a pointer to the curent tag structure, and an + DTD are valid, and the function is passed a pointer to the current tag structure, and an "element stack" which represents the state of nesting within SGML elements. - The following aspects are from Dan Connolly's suggestions: Binary search, Strcutured + The following aspects are from Dan Connolly's suggestions: Binary search, Structured object scheme basically, SGML content enum type. (c) Copyright CERN 1991 - See Copyright.html @@ -49,52 +49,50 @@ typedef struct { /* Could put type info in here */ } attr; -typedef enum _TagClass { +typedef int TagClass; /* textflow */ - Tgc_FONTlike = 0x00001,/* S,STRIKE,I,B,TT,U,BIG,SMALL,STYLE,BLINK;BR,TAB */ - Tgc_EMlike = 0x00002, /* EM,STRONG,DFN,CODE,SAMP,KBD,VAR,CITE,Q,INS,DEL,SPAN,.. */ - Tgc_MATHlike = 0x00004, /* SUB,SUP,MATH,COMMENT */ - Tgc_Alike = 0x00008, /* A */ - Tgc_formula = 0x00010, /* not used until math is supported better... */ +#define Tgc_FONTlike 0x00001 /* S,STRIKE,I,B,TT,U,BIG,SMALL,STYLE,BLINK;BR,TAB */ +#define Tgc_EMlike 0x00002 /* EM,STRONG,DFN,CODE,SAMP,KBD,VAR,CITE,Q,INS,DEL,SPAN,.. */ +#define Tgc_MATHlike 0x00004 /* SUB,SUP,MATH,COMMENT */ +#define Tgc_Alike 0x00008 /* A */ +#define Tgc_formula 0x00010 /* not used until math is supported better... */ /* used for special structures: forms, tables,... */ - Tgc_TRlike = 0x00020,/* TR and similar */ - Tgc_SELECTlike = 0x00040,/* SELECT,INPUT,TEXTAREA(,...) */ +#define Tgc_TRlike 0x00020 /* TR and similar */ +#define Tgc_SELECTlike 0x00040 /* SELECT,INPUT,TEXTAREA(,...) */ /* structure */ - Tgc_FORMlike = 0x00080,/* FORM itself */ - Tgc_Plike = 0x00100, /* P,H1..H6,... structures containing text or +#define Tgc_FORMlike 0x00080 /* FORM itself */ +#define Tgc_Plike 0x00100 /* P,H1..H6,... structures containing text or insertion but not other structures */ - Tgc_DIVlike = 0x00200, /* ADDRESS,FIG,BDO,NOTE,FN,DIV,CENTER;FIG +#define Tgc_DIVlike 0x00200 /* ADDRESS,FIG,BDO,NOTE,FN,DIV,CENTER;FIG structures which can contain other structures */ - Tgc_LIlike = 0x00400, /* LH,LI,DT,DD;TH,TD structure-like, only valid +#define Tgc_LIlike 0x00400 /* LH,LI,DT,DD;TH,TD structure-like, only valid within certain other structures */ - Tgc_ULlike = 0x00800, /* UL,OL,DL,DIR,MENU;TABLE;XMP,LISTING +#define Tgc_ULlike 0x00800 /* UL,OL,DL,DIR,MENU;TABLE;XMP,LISTING special in some way, cannot contain (parsed) text directly */ /* insertions */ - Tgc_BRlike = 0x01000,/* BR,IMG,TAB allowed in any text */ - Tgc_APPLETlike = 0x02000, /* APPLET,OBJECT,EMBED,SCRIPT */ - Tgc_HRlike = 0x04000, /* HR,MARQUEE can contain all kinds of things +#define Tgc_BRlike 0x01000 /* BR,IMG,TAB allowed in any text */ +#define Tgc_APPLETlike 0x02000 /* APPLET,OBJECT,EMBED,SCRIPT */ +#define Tgc_HRlike 0x04000 /* HR,MARQUEE can contain all kinds of things and/or are not allowed (?) in running text */ - Tgc_MAPlike = 0x08000, /* MAP,AREA some specials that never contain +#define Tgc_MAPlike 0x08000 /* MAP,AREA some specials that never contain (directly or indirectly) other things than special insertions */ - Tgc_outer = 0x10000, /* HTML,FRAMESET,FRAME,PLAINTEXT; */ - Tgc_BODYlike = 0x20000, /* BODY,BODYTEXT,NOFRAMES,TEXTFLOW; */ - Tgc_HEADstuff = 0x40000, /* HEAD,BASE,STYLE,TITLE; */ +#define Tgc_outer 0x10000 /* HTML,FRAMESET,FRAME,PLAINTEXT; */ +#define Tgc_BODYlike 0x20000 /* BODY,BODYTEXT,NOFRAMES,TEXTFLOW; */ +#define Tgc_HEADstuff 0x40000 /* HEAD,BASE,STYLE,TITLE; */ /* special relations */ - Tgc_same = 0x80000 -} TagClass; +#define Tgc_same 0x80000 /* Some more properties of tags (or rather, elements) and rules how to deal with them. - kw */ -typedef enum _TagFlags { - Tgf_endO = 0x00001, /* end tag can be Omitted */ - Tgf_startO = 0x00002, /* start tag can be Omitted */ - Tgf_mafse = 0x00004, /* Make Attribute-Free Start-tag End instead +typedef int TagFlags; +#define Tgf_endO 0x00001 /* end tag can be Omitted */ +#define Tgf_startO 0x00002 /* start tag can be Omitted */ +#define Tgf_mafse 0x00004 /* Make Attribute-Free Start-tag End instead (if found invalid) */ - Tgf_strict = 0x00008 /* Ignore contained invalid elements, +#define Tgf_strict 0x00008 /* Ignore contained invalid elements, don't pass them on */ -} TagFlags; /* A tag structure describes an SGML element. ** ----------------------------------------- @@ -105,7 +103,7 @@ typedef enum _TagFlags { ** attributes points to a zero-terminated array ** of attribute names. ** -** litteral determines how the SGML engine parses the charaters +** litteral determines how the SGML engine parses the characters ** within the element. If set, tag openers are ignored ** except for that which opens a matching closing tag. ** @@ -166,11 +164,11 @@ typedef struct _HTSGMLContext *HTSGMLContext; /* Hidden */ Structured Object definition A structured object is something which can reasonably be represented - in SGML. I'll rephrase that. A structured object is am ordered + in SGML. I'll rephrase that. A structured object is an ordered tree-structured arrangement of data which is representable as text. - The SGML parer outputs to a Structured object. A Structured object + The SGML parser outputs to a Structured object. A Structured object can output its contents to another Structured Object. It's a kind of - typed stream. The architecure is largely Dan Conolly's. Elements and + typed stream. The architecture is largely Dan Conolly's. Elements and entities are passed to the sob by number, implying a knowledge of the DTD. Knowledge of the SGML syntax is not here, though. @@ -227,7 +225,7 @@ typedef struct _HTStructuredClass{ /* Equivalents to the following functions possibly could be generalised - into additional HTStructuredClass members. FOr now they don't do + into additional HTStructuredClass members. For now they don't do anything target-specific. - kw */ extern BOOLEAN LYCheckForCSI PARAMS((HTParentAnchor *anchor, char **url)); diff --git a/WWW/Library/Implementation/tcp.h b/WWW/Library/Implementation/tcp.h index 7dde5f34..7bfdb39b 100644 --- a/WWW/Library/Implementation/tcp.h +++ b/WWW/Library/Implementation/tcp.h @@ -75,7 +75,6 @@ typedef struct sockaddr_in SockA; /* See netinet/in.h */ #else # define D_NAMLEN(dirent) (dirent)->d_namlen # define STRUCT_DIRENT struct direct -# define direct dirent /* FIXME */ # if HAVE_SYS_NDIR_H # include <sys/ndir.h> # endif @@ -485,9 +484,6 @@ struct timeval { #define NETCLOSE close_s #endif -/* -SCO ODT unix version - */ #if HAVE_UNISTD_H #include <unistd.h> #endif /* HAVE_UNISTD_H */ @@ -511,7 +507,6 @@ Regular BSD unix versions */ #ifndef INCLUDES_DONE #include <sys/types.h> -/* #include <streams/streams.h> not ultrix */ #if HAVE_STRING_H #include <string.h> #endif /* HAVE_STRING_H */ @@ -527,16 +522,20 @@ Regular BSD unix versions #include <sys/stat.h> #include <sys/param.h> #include <sys/file.h> /* For open() etc */ + #if defined(NeXT) || defined(sony_news) #ifndef mode_t typedef unsigned short mode_t; #endif /* !mode_t */ + #ifndef pid_t typedef int pid_t; #endif /* !pid_t */ + #ifndef S_ISREG #define S_ISREG(m) (((m) & 0170000) == 0100000) #endif /* S_ISREG */ + #ifndef WEXITSTATUS #ifdef sony_news #define WEXITSTATUS(s) WIFEXITED(s) @@ -544,6 +543,7 @@ typedef int pid_t; #define WEXITSTATUS(s) (((s).w_status >> 8) & 0377) #endif /* sony_news */ #endif /* !WEXITSTATUS */ + #ifndef WTERMSIG #ifdef sony_news #define WTERMSIG(s) (s).w_termsig @@ -551,7 +551,9 @@ typedef int pid_t; #define WTERMSIG(s) (((s).w_status >> 8) & 0177) #endif /* sony_news */ #endif /* !WTERMSIG */ + #endif /* NeXT || sony_news */ + #define INCLUDES_DONE #endif /* Normal includes */ @@ -593,28 +595,6 @@ typedef int pid_t; #else -/* FIXME: remove after completing configure-script */ -#ifdef unix /* if this is to compile on a UNIX machine */ -#define HAVE_READDIR 1 /* if directory reading functions are available */ -#ifdef USE_DIRENT /* sys v version */ -#include <dirent.h> -#define direct dirent -#else -#include <sys/dir.h> -#endif /* USE_DIRENT */ -#if defined(sun) && defined(__svr4__) -#include <sys/fcntl.h> -#include <limits.h> -#else -#if defined(__hpux) || defined(LINUX) || defined (__FreeBSD__) -#include <limits.h> -#endif /* __hpux || LINUX || __FreeBSD__ */ -#endif /* sun && __svr4__ */ -#if !defined(MAXINT) && defined(INT_MAX) -#define MAXINT INT_MAX -#endif /* !MAXINT && INT_MAX */ -#endif /* unix */ - #ifndef VM #ifndef VMS #ifndef THINK_C diff --git a/WWW/Library/apollo_m68k/Makefile b/WWW/Library/apollo_m68k/Makefile deleted file mode 100644 index 20aa9ac8..00000000 --- a/WWW/Library/apollo_m68k/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# Make WWW for apollo NOTE WWW macro changed for unwritable source tree ** -# - -# For W3 distribution, machine type for subdirectories -WWW_MACH = apollo_m68k - -# For ASIS installation, the ASIS code for the machine/os -ASIS_MACH = apollo-68k/sr-10.3 - - -CFLAGS = -O -DDEBUG -LFLAGS = -CC = cc -LFLAGS = - -# Directory for installed binary: -BINDIR = /usr/local/bin - - - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. -#WWW = /user/timbl/hypertext/WWW - -# Where should temporary (object) files go? -WTMP = ../.. - - -# Where is the W3 object library? -# LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) -LIBDIR = /tmp/WWWLibrary_Build - -include $(WWW)/Library/Implementation/CommonMakefile - - - - diff --git a/WWW/Library/clix/Makefile b/WWW/Library/clix/Makefile deleted file mode 100644 index e1996d27..00000000 --- a/WWW/Library/clix/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# Make WWW under unix for a.n.other unix system (bsd) -# Use this as a template - -# For W3 distribution, machine type for subdirectories -WWW_MACH = clix - -# The ASIS repository's name for the machine we are on -ASIS_MACH = hardware/os - - -CFLAGS = -O -DDEBUG -DUSG -DUNIX -DCLIX -LFLAGS = -CC = cc - -# Directory for installed binary: -BINDIR = /usr/local/bin - -# Where is the W3 object library to be installed (not normally done)? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -include $(WWW)/Library/Implementation/CommonMakefile - diff --git a/WWW/Library/convex/Makefile b/WWW/Library/convex/Makefile deleted file mode 100644 index fcd28786..00000000 --- a/WWW/Library/convex/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# Make WWW under ConvexOS - -# For W3 distribution, machine type for subdirectories -WWW_MACH = convex - -# The ASIS repository's name for the machine we are on -ASIS_MACH = hardware/os - - -CFLAGS = -O -DDEBUG -Dunix -LFLAGS = -CC = cc - -# Directory for installed binary: -BINDIR = /usr/local/bin - -# Where is the W3 object library to be installed (not normally done)? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - -# HTWAIS = $(LOB)/HTWAIS.o -# WAIS = YES -# WAISINC = -I/tmp/freeWAIS-0.202/ir -# WAISCFLAGS = -DDIRECT_WAIS - -include $(WWW)/Library/Implementation/CommonMakefile diff --git a/WWW/Library/decstation/Makefile b/WWW/Library/decstation/Makefile deleted file mode 100644 index b35d278c..00000000 --- a/WWW/Library/decstation/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# Platform-specific Makefile for W3 Library (decstation) -# ----------------------------------------- -# - -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -#CFLAGS = -CFLAGS = -O -CC = cc -#LFLAGS = -lresolv -LFLAGS = - -ASIS_MACH = dec-station/ultrix-4.2 -WWW_MACH = decstation - -# Directory for installed binary: -LIBDIR = /usr/local/lib - -include $(WWW)/Library/Implementation/CommonMakefile diff --git a/WWW/Library/duns/Makefile b/WWW/Library/duns/Makefile deleted file mode 100644 index 4852817e..00000000 --- a/WWW/Library/duns/Makefile +++ /dev/null @@ -1,489 +0,0 @@ -# Makefile generated by imake - do not edit! -# $XConsortium: imake.c,v 1.51 89/12/12 12:37:30 jim Exp $ -# -# The cpp used on this machine replaces all newlines and multiple tabs and -# spaces in a macro expansion with a single space. Imake tries to compensate -# for this, but is not always successful. -# - -########################################################################### -# Makefile generated from "Imake.tmpl" and </tmp/IIf.a00214> -# $XConsortium: Imake.tmpl,v 1.77 89/12/18 17:01:37 jim Exp $ -# -# Platform-specific parameters may be set in the appropriate .cf -# configuration files. Site-wide parameters may be set in the file -# site.def. Full rebuilds are recommended if any parameters are changed. -# -# If your C preprocessor doesn't define any unique symbols, you'll need -# to set BOOTSTRAPCFLAGS when rebuilding imake (usually when doing -# "make Makefile", "make Makefiles", or "make World"). -# -# If you absolutely can't get imake to work, you'll need to set the -# variables at the top of each Makefile as well as the dependencies at the -# bottom (makedepend will do this automatically). -# - -########################################################################### -# platform-specific configuration parameters - edit sun.cf to change - -# platform: $XConsortium: sun.cf,v 1.38 89/12/23 16:10:10 jim Exp $ -# operating system: SunOS 4.0.3 - -########################################################################### -# site-specific configuration parameters - edit site.def to change - - SHELL = /bin/sh - - TOP = . - CURRENT_DIR = . - - AR = ar clq - BOOTSTRAPCFLAGS = - CC = cc - - COMPRESS = compress - CPP = /lib/cpp $(STD_CPP_DEFINES) - PREPROCESSCMD = cc -E $(STD_CPP_DEFINES) - INSTALL = install - LD = ld - LINT = lint - LINTLIBFLAG = -C - LINTOPTS = -axz - LN = ln -s - MAKE = make - MV = mv - CP = cp - RANLIB = ranlib - RANLIBINSTFLAGS = - RM = rm -f - STD_INCLUDES = - STD_CPP_DEFINES = - STD_DEFINES = - EXTRA_LOAD_FLAGS = - EXTRA_LIBRARIES = - TAGS = ctags - - SHAREDCODEDEF = -DSHAREDCODE - SHLIBDEF = -DSUNSHLIB - - PROTO_DEFINES = - - INSTPGMFLAGS = - - INSTBINFLAGS = -m 0755 - INSTUIDFLAGS = -m 4755 - INSTLIBFLAGS = -m 0664 - INSTINCFLAGS = -m 0444 - INSTMANFLAGS = -m 0444 - INSTDATFLAGS = -m 0444 - INSTKMEMFLAGS = -m 4755 - - DESTDIR = - - TOP_INCLUDES = -I$(INCROOT) - - CDEBUGFLAGS = -O - CCOPTIONS = - COMPATFLAGS = - - ALLINCLUDES = $(STD_INCLUDES) $(TOP_INCLUDES) $(INCLUDES) $(EXTRA_INCLUDES) - ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(DEFINES) $(COMPATFLAGS) - CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES) - LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) - LDLIBS = $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) - LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) - LDCOMBINEFLAGS = -X -r - - MACROFILE = sun.cf - RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut - - IMAKE_DEFINES = - - IRULESRC = $(CONFIGDIR) - IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES) - - ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/Imake.rules \ - $(IRULESRC)/Project.tmpl $(IRULESRC)/site.def \ - $(IRULESRC)/$(MACROFILE) $(EXTRA_ICONFIGFILES) - -########################################################################### -# X Window System Build Parameters -# $XConsortium: Project.tmpl,v 1.63 89/12/18 16:46:44 jim Exp $ - -########################################################################### -# X Window System make variables; this need to be coordinated with rules -# $XConsortium: Project.tmpl,v 1.63 89/12/18 16:46:44 jim Exp $ - - PATHSEP = / - USRLIBDIR = $(DESTDIR)/usr/lib - BINDIR = $(DESTDIR)/usr/bin/X11 - INCROOT = $(DESTDIR)/usr/include - BUILDINCROOT = $(TOP) - BUILDINCDIR = $(BUILDINCROOT)/X11 - BUILDINCTOP = .. - INCDIR = $(INCROOT)/X11 - ADMDIR = $(DESTDIR)/usr/adm - LIBDIR = $(USRLIBDIR)/X11 - CONFIGDIR = $(LIBDIR)/config - LINTLIBDIR = $(USRLIBDIR)/lint - - FONTDIR = $(LIBDIR)/fonts - XINITDIR = $(LIBDIR)/xinit - XDMDIR = $(LIBDIR)/xdm - AWMDIR = $(LIBDIR)/awm - TWMDIR = $(LIBDIR)/twm - GWMDIR = $(LIBDIR)/gwm - MANPATH = $(DESTDIR)/usr/man - MANSOURCEPATH = $(MANPATH)/man - MANDIR = $(MANSOURCEPATH)n - LIBMANDIR = $(MANSOURCEPATH)3 - XAPPLOADDIR = $(LIBDIR)/app-defaults - - SOXLIBREV = 4.2 - SOXTREV = 4.0 - SOXAWREV = 4.0 - SOOLDXREV = 4.0 - SOXMUREV = 4.0 - SOXEXTREV = 4.0 - - FONTCFLAGS = -t - - INSTAPPFLAGS = $(INSTDATFLAGS) - - IMAKE = imake - DEPEND = makedepend - RGB = rgb - FONTC = bdftosnf - MKFONTDIR = mkfontdir - MKDIRHIER = /bin/sh $(BINDIR)/mkdirhier.sh - - CONFIGSRC = $(TOP)/config - CLIENTSRC = $(TOP)/clients - DEMOSRC = $(TOP)/demos - LIBSRC = $(TOP)/lib - FONTSRC = $(TOP)/fonts - INCLUDESRC = $(TOP)/X11 - SERVERSRC = $(TOP)/server - UTILSRC = $(TOP)/util - SCRIPTSRC = $(UTILSRC)/scripts - EXAMPLESRC = $(TOP)/examples - CONTRIBSRC = $(TOP)/../contrib - DOCSRC = $(TOP)/doc - RGBSRC = $(TOP)/rgb - DEPENDSRC = $(UTILSRC)/makedepend - IMAKESRC = $(CONFIGSRC) - XAUTHSRC = $(LIBSRC)/Xau - XLIBSRC = $(LIBSRC)/X - XMUSRC = $(LIBSRC)/Xmu - TOOLKITSRC = $(LIBSRC)/Xt - AWIDGETSRC = $(LIBSRC)/Xaw - OLDXLIBSRC = $(LIBSRC)/oldX - XDMCPLIBSRC = $(LIBSRC)/Xdmcp - BDFTOSNFSRC = $(FONTSRC)/bdftosnf - MKFONTDIRSRC = $(FONTSRC)/mkfontdir - EXTENSIONSRC = $(TOP)/extensions - - DEPEXTENSIONLIB = - EXTENSIONLIB = -lXext - - DEPXLIB = $(DEPEXTENSIONLIB) - XLIB = $(EXTENSIONLIB) -lX11 - - DEPXAUTHLIB = $(USRLIBDIR)/libXau.a - XAUTHLIB = -lXau - - DEPXMULIB = - XMULIB = -lXmu - - DEPOLDXLIB = - OLDXLIB = -loldX - - DEPXTOOLLIB = - XTOOLLIB = -lXt - - DEPXAWLIB = - XAWLIB = -lXaw - - LINTEXTENSIONLIB = $(USRLIBDIR)/llib-lXext.ln - LINTXLIB = $(USRLIBDIR)/llib-lX11.ln - LINTXMU = $(USRLIBDIR)/llib-lXmu.ln - LINTXTOOL = $(USRLIBDIR)/llib-lXt.ln - LINTXAW = $(USRLIBDIR)/llib-lXaw.ln - - DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) - - DEPLIBS1 = $(DEPLIBS) - DEPLIBS2 = $(DEPLIBS) - DEPLIBS3 = $(DEPLIBS) - -########################################################################### -# Imake rules for building libraries, programs, scripts, and data files -# rules: $XConsortium: Imake.rules,v 1.67 89/12/18 17:14:15 jim Exp $ - -########################################################################### -# start of Imakefile - -# Make WWW under unix for a.n.other unix system (bsd) -# Use this as a template - -TK_WWW_SOURCE_PATH=/a/dxcern/userd/tbl/hypertext/WWW/TkWWW/Tcl - -TK_WWW_INSTALL_PATH=/a/dxcern/userd/tbl/hypertext/WWW/TkWWW/$(WWW_MACH) - -TK_WWW_HOME_PAGE=http://www.w3.org/default.html -TK_WWW_START_PAGE=$(TK_WWW_HOME_PAGE) - -CC = gcc -fno-builtin -Wall - -CDEBUGFLAGS = -O3 -pipe - -COMPATFLAGS = -I/afs/athena.mit.edu/course/other/cdsdev/www-compat -CCOPTIONS = - -BINDIR = $(TK_WWW_INSTALL_PATH) - -# For W3 distribution, machine type for subdirectories -WWW_MACH = unix.x - -# The ASIS repository's name for the machine we are on -ASIS_MACH = hardware/os - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = /tmp - -# Common Makefile for W3 Library Code -# ----------------------------------- -# -# (c) CERN 1990, 1991 -- see Copyright.html for conditions -# -# This file should be invariant between systems. -# DEPENDENCIES NOT COMPLETE - -# -# make Compile and link the software (private version) -# make clean Remove intermediate files - -WC = $(WWW)/Library -CMN = $(WWW)/Library/Implementation/ - -# Where shall we put the objects and built library? - -LOB = $(WTMP)/Library/$(WWW_MACH) - -# Bug: This path, if relative, is taken relative to the directory -# in which this makefile is, not the pwd. This screws up the -# recursive invocation - -VC = 2.14 - -CFLAGS2 = $(CFLAGS) -I$(CMN) - -CERNLIBBIN = $(WWW)/bin - -COMMON = $(LOB)/HTParse.o $(LOB)/HTAccess.o $(LOB)/HTTP.o \ - $(LOB)/HTFile.o $(LOB)/HTFTP.o $(LOB)/HTTCP.o \ - $(LOB)/SGML.o $(LOB)/HTMLDTD.o $(LOB)/HTChunk.o \ - $(LOB)/HTPlain.o $(LOB)/HTWriter.o $(LOB)/HTFWriter.o \ - $(LOB)/HTMLGen.o \ - $(LOB)/HTAtom.o $(LOB)/HTAnchor.o $(LOB)/HTStyle.o \ - $(LOB)/HTList.o $(LOB)/HTString.o $(LOB)/HTAlert.o \ - $(LOB)/HTRules.o $(LOB)/HTFormat.o $(LOB)/HTInit.o $(LOB)/HTMIME.o \ - $(LOB)/HTHistory.o $(LOB)/HTNews.o $(LOB)/HTGopher.o \ - $(LOB)/HTTelnet.o $(LOB)/HTWSRC.o $(HTWAIS) - -CFILES = $(CMN)HTParse.c $(CMN)HTAccess.c $(CMN)HTTP.c $(CMN)HTFile.c \ - $(CMN)HTFTP.c $(CMN)HTTCP.c $(CMN)SGML.c \ - $(CMN)HTMLDTD.c \ - $(CMN)HTPlain.c $(CMN)HTWriter.c $(CMN)HTFWriter.c $(CMN)HTMLGen.c \ - $(CMN)HTChunk.c $(CMN)HTAtom.c $(CMN)HTAnchor.c $(CMN)HTStyle.c \ - $(CMN)HTList.c $(CMN)HTString.c $(CMN)HTAlert.c $(CMN)HTRules.c \ - $(CMN)HTFormat.c $(CMN)HTInit.c $(CMN)HTMIME.c $(CMN)HTHistory.c \ - $(CMN)HTNews.c $(CMN)HTGopher.c $(CMN)HTTelnet.c \ - $(CMN)HTWAIS.c $(CMN)HTWSRC.c - -HFILES = $(CMN)HTParse.h $(CMN)HTAccess.h $(CMN)HTTP.h $(CMN)HTFile.h \ - $(CMN)HTFTP.h $(CMN)HTTCP.h \ - $(CMN)SGML.h $(CMN)HTML.h $(CMN)HTMLDTD.h $(CMN)HTChunk.h \ - $(CMN)HTPlain.h $(CMN)HTWriter.h \ - $(CMN)HTFWriter.h $(CMN)HTMLGen.h \ - $(CMN)HTStream.h \ - $(CMN)HTAtom.h $(CMN)HTAnchor.h $(CMN)HTStyle.h \ - $(CMN)HTList.h \ - $(CMN)HTString.h $(CMN)HTAlert.h $(CMN)HTRules.h \ - $(CMN)HTFormat.h $(CMN)HTInit.h \ - $(CMN)HTMIME.h $(CMN)HTHistory.h $(CMN)HTNews.h \ - $(CMN)HTGopher.h \ - $(CMN)HTUtils.h $(CMN)tcp.h $(CMN)WWW.h $(CMN)HText.h \ - $(CMN)HTTelnet.h \ - $(CMN)HTWAIS.h $(CMN)HTWSRC.h - -SOURCES = $(CFILES) $(HFILES) $(CMN)Version.make $(CMN)CommonMakefile \ - $(WWW)/README.txt $(WWW)/Copyright.txt $(WWW)/BUILD -SPECIFIC = $(WWW)/All - -# Library -# -# On SGI, ranlib is unnecessary and does not exist so we ignore errors -# for that step -all: $(LOB)/libwww.a - $(MV) $(LOB)/libwww.a $(WC)/$(WWW_MACH) - -$(LOB)/libwww.a : $(COMMON) - ar r $(LOB)/libwww.a $(COMMON) - -ranlib $(LOB)/libwww.a - -# Clean up everything generatable except final products -clean :: - $(RM) $(LOB) - -# Clean up everything generatable including final products - -cleanall :: clean - $(RM) $(LOB)/libwww.a - -# Common code -# ----------- - -# Directory for object files - .created checks it exists - -OE = $(LOB)/.created -$(OE) : - -mkdir $(WTMP) - -mkdir $(WTMP)/Library - -mkdir $(WTMP)/Library/$(WWW_MACH) - touch $@ - -$(LOB)/HTList.o : $(OE) $(CMN)HTList.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTList.c - -$(LOB)/HTAnchor.o : $(OE) $(CMN)HTAnchor.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAnchor.c - -$(LOB)/HTFormat.o : $(OE) $(CMN)HTFormat.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFormat.c - -$(LOB)/HTInit.o : $(OE) $(CMN)HTInit.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTInit.c - -$(LOB)/HTMIME.o : $(OE) $(CMN)HTMIME.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMIME.c - -$(LOB)/HTHistory.o : $(OE) $(CMN)HTHistory.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTHistory.c - -$(LOB)/HTNews.o : $(OE) $(CMN)HTNews.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTNews.c - -$(LOB)/HTGopher.o : $(OE) $(CMN)HTGopher.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTGopher.c - -$(LOB)/HTTelnet.o : $(OE) $(CMN)HTTelnet.c $(CMN)HTUtils.h $(CMN)HTTelnet.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTelnet.c - -$(LOB)/HTStyle.o : $(OE) $(CMN)HTStyle.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTStyle.c - -$(LOB)/HTAtom.o : $(OE) $(CMN)HTAtom.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAtom.c - -$(LOB)/HTChunk.o : $(OE) $(CMN)HTChunk.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTChunk.c - -$(LOB)/HTString.o : $(OE) $(CMN)HTString.c $(CMN)HTUtils.h $(CMN)Version.make - $(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTString.c - -$(LOB)/HTAlert.o : $(OE) $(CMN)HTAlert.c $(CMN)HTUtils.h $(CMN)Version.make - $(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTAlert.c - -$(LOB)/HTRules.o : $(OE) $(CMN)HTRules.c $(CMN)HTUtils.h $(CMN)Version.make - $(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTRules.c - -$(LOB)/SGML.o : $(OE) $(CMN)SGML.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)SGML.c - -$(LOB)/HTMLGen.o : $(OE) $(CMN)HTMLGen.c $(CMN)HTUtils.h $(CMN)HTMLDTD.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMLGen.c - -$(LOB)/HTMLDTD.o : $(OE) $(CMN)HTMLDTD.c $(CMN)SGML.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMLDTD.c - -$(LOB)/HTPlain.o : $(OE) $(CMN)HTPlain.c $(CMN)HTPlain.h $(CMN)HTStream.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTPlain.c - -$(LOB)/HTWAIS.o : $(OE) $(CMN)HTWAIS.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(WAISINC) $(CMN)HTWAIS.c - -$(LOB)/HTWSRC.o : $(OE) $(CMN)HTWSRC.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTWSRC.c - -$(LOB)/HTWriter.o : $(OE) $(CMN)HTWriter.c $(CMN)HTWriter.h $(CMN)HTStream.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTWriter.c - -$(LOB)/HTFWriter.o : $(OE) $(CMN)HTFWriter.c $(CMN)HTFWriter.h $(CMN)HTStream.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFWriter.c - -# Communications & Files - -$(LOB)/HTTP.o : $(OE) $(CMN)HTTP.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTP.c - -$(LOB)/HTTCP.o : $(OE) $(CMN)HTTCP.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTCP.c - -$(LOB)/HTFile.o : $(OE) $(CMN)HTFile.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFile.c - -$(LOB)/HTFTP.o : $(OE) $(CMN)HTFTP.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFTP.c - -$(LOB)/HTAccess.o : $(OE) $(CMN)HTAccess.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAccess.c - -$(LOB)/HTParse.o : $(OE) $(CMN)HTParse.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTParse.c - -########################################################################### -# common rules for all Makefiles - do not edit - -emptyrule:: - -clean:: - $(RM_CMD) \#* - -Makefile:: - -@if [ -f Makefile ]; then \ - echo " $(RM) Makefile.bak; $(MV) Makefile Makefile.bak"; \ - $(RM) Makefile.bak; $(MV) Makefile Makefile.bak; \ - else exit 0; fi - $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) - -tags:: - $(TAGS) -w *.[ch] - $(TAGS) -xw *.[ch] > TAGS - -saber: - #load $(ALLDEFINES) $(SRCS) - -osaber: - #load $(ALLDEFINES) $(OBJS) - -########################################################################### -# empty rules for directories that do not have SUBDIRS - do not edit - -install:: - @echo "install in $(CURRENT_DIR) done" - -install.man:: - @echo "install.man in $(CURRENT_DIR) done" - -Makefiles:: - -includes:: - -########################################################################### -# dependencies generated by makedepend - diff --git a/WWW/Library/freebsd/Makefile b/WWW/Library/freebsd/Makefile deleted file mode 100644 index a82f13b8..00000000 --- a/WWW/Library/freebsd/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# Make WWW under FreeBSD -# - -# For W3 distribution, machine type for subdirectories -WWW_MACH = freebsd - -# The ASIS repository's name for the machine we are on -ASIS_MACH = i386/FreeBSD - - -CFLAGS += -DDEBUG -LFLAGS = - -# Directory for installed binary: -BINDIR = /usr/local/bin - -# Where is the W3 object library to be installed (not normally done)? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - -include $(WWW)/Library/Implementation/CommonMakefile diff --git a/WWW/Library/isc/Makefile b/WWW/Library/isc/Makefile deleted file mode 100644 index 29de6885..00000000 --- a/WWW/Library/isc/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# Make WWW under unix for a.n.other unix system (bsd) -# Use this as a template - -# For W3 distribution, machine type for subdirectories -WWW_MACH = isc - -# The ASIS repository's name for the machine we are on -ASIS_MACH = intel/isc - - -CFLAGS = -DDEBUG -O -DISC -Dvfork=fork -LFLAGS = -CC = cc - -# Directory for installed binary: -BINDIR = /usr/local/bin - -# Where is the W3 object library to be installed (not normally done)? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -include $(WWW)/Library/Implementation/CommonMakefile - diff --git a/WWW/Library/mips/Makefile b/WWW/Library/mips/Makefile deleted file mode 100644 index 1c84cbe0..00000000 --- a/WWW/Library/mips/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# Makefile for WWW under svr4 -# - -# For W3 distribution, machine type for subdirectories -WWW_MACH = mips - -# The ASIS repository's name for the machine we are on -ASIS_MACH = mips/mips - - -#CFLAGS = -DDEBUG -systype svr3 -DMIPS -DNO_BCOPY -CFLAGS = -O -DDEBUG -systype svr3 -I/svr3/usr/include/bsd -LFLAGS = -CC = cc - -# Directory for installed binary: -BINDIR = /usr/local/bin - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - -# Where is the W3 object library? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -include $(WWW)/Library/Implementation/CommonMakefile diff --git a/WWW/Library/netbsd/Makefile b/WWW/Library/netbsd/Makefile deleted file mode 100644 index ae92760a..00000000 --- a/WWW/Library/netbsd/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# Make WWW under NetBSD -# - -# For W3 distribution, machine type for subdirectories -WWW_MACH = netbsd - -# The ASIS repository's name for the machine we are on -ASIS_MACH = i386/NetBSD - - -CFLAGS = -O -DUSE_DIRENT -LFLAGS = -CC = cc - -# Directory for installed binary: -BINDIR = /usr/local/bin - -# Where is the W3 object library to be installed (not normally done)? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - -include $(WWW)/Library/Implementation/CommonMakefile - diff --git a/WWW/Library/next/Makefile b/WWW/Library/next/Makefile deleted file mode 100644 index bd35c89a..00000000 --- a/WWW/Library/next/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# Platform-specific Makefile for W3 Library (NeXT) -# ----------------------------------------- -# -# Library compiled with fudge to alow XMOSAIC to -# pick up binary files... for now. - -WWW = ../.. - -# Where should temporary (object) files go? Normally, WTMP = $(WWW) -#WTMP = /tmp -WTMP = $(WWW) - -# For MACH 3.0 it seems -bsd is needed to order to define errno -# in /usr/include/bsd/sys/errno.h. But __STRICT_BSD__ is needed for -# errno. - -CFLAGS = -Wall -O -DXMOSAIC_HACK - -# Yes please, I want direct WAIS access -# -#WAIS = ../../../freeWAIS -#WAISINC = -I$(WAIS)/ir -#WAISCFLAGS = -DDIRECT_WAIS -#WAISLIB = $(WAIS)/bin/client.a $(WAIS)/bin/wais.a -# $(WAIS)/bin/inv.a $(WAIS)/bin/wais.a -#HTWAIS = $(WTMP)/Library/$(WWW_MACH)/HTWAIS.o - -CC = cc -# For testing memory leaks only! Use /NextDeveloper/MallocDebug app -LFLAGS = -lMallocDebug -#LFLAGS = - -WWW_MACH = next -ASIS_MACH = next/2.0 - - -# Directory for installed binary: -LIBDIR = /usr/local/lib - -include $(WWW)/Library/Implementation/CommonMakefile diff --git a/WWW/Library/osf/Makefile b/WWW/Library/osf/Makefile deleted file mode 100644 index a81457a6..00000000 --- a/WWW/Library/osf/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# Platform-specific Makefile for W3 Library (decstation) -# ----------------------------------------- -# - -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -#CFLAGS = -CFLAGS = -DSYS5 -CC = cc -O -#LFLAGS = -LFLAGS = - -ASIS_MACH = alpha/osf1 -WWW_MACH = osf - -# Directory for installed binary: -LIBDIR = /usr/local/lib - -include $(WWW)/Library/Implementation/CommonMakefile diff --git a/WWW/Library/ptx/Makefile b/WWW/Library/ptx/Makefile deleted file mode 100644 index 772d6c6a..00000000 --- a/WWW/Library/ptx/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# Make WWW under Sequent's DYNIX/ptx -# - -# For W3 distribution, machine type for subdirectories -WWW_MACH = ptx - -# The ASIS repository's name for the machine we are on -ASIS_MACH = Sequent/ptx - - -CFLAGS = -O -DDEBUG -DUSE_DIRENT -DSVR4 -DNO_IOCTL -DUSE_FCNTL -LFLAGS = -CC = cc - -# Directory for installed binary: -BINDIR = /usr/local/bin - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -# Where is the W3 object library? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -include $(WWW)/Library/Implementation/CommonMakefile diff --git a/WWW/Library/rs6000/Makefile b/WWW/Library/rs6000/Makefile deleted file mode 100644 index 334a5a4a..00000000 --- a/WWW/Library/rs6000/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# Make WWW under unix for rs6000 with no gcc -# - -# For W3 distribution, machine type for subdirectories -WWW_MACH = rs6000 - -# For ASIS -ASIS_MACH = ibm-rs6000/aix-3.2 - -# Directory for installed binary: -BINDIR = /usr/local/bin - -# The AIX compiler does not define unix... AIX will do it and avoid realloc bug - -CFLAGS = -O -DDEBUG -CC = cc -LFLAGS = - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = $(WWW) - -# Where is the W3 object library? -LIBDIR = /usr/local/lib - -include $(WWW)/Library/Implementation/CommonMakefile diff --git a/WWW/Library/sco/Makefile b/WWW/Library/sco/Makefile deleted file mode 100644 index a00a948b..00000000 --- a/WWW/Library/sco/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# Make WWW under unix for a.n.other unix system (bsd) -# Use this as a template - -# For W3 distribution, machine type for subdirectories -WWW_MACH = sco - -# The ASIS repository's name for the machine we are on -# SCO does not presently have ranlib. Ignore the error -# message about that when the CommonMakefile tries to -# invoke it. -ASIS_MACH = intel/sco - - -CFLAGS = -O -DDEBUG -DSVR4 -LFLAGS = -CC = cc - -# Directory for installed binary: -BINDIR = /usr/local/bin - -# Where is the W3 object library to be installed (not normally done)? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -include $(WWW)/Library/Implementation/CommonMakefile - diff --git a/WWW/Library/sgi/Makefile b/WWW/Library/sgi/Makefile deleted file mode 100644 index 24530722..00000000 --- a/WWW/Library/sgi/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# Make WWW for Silicon Graphics -# -# For W3 distribution, machine type for subdirectories -WWW_MACH = sgi - -# Architecutre in ASIS scheme -# SGI does not presently have ranlib. Ignore the error -# message about that when the CommonMakefile tries to -# invoke it. -ASIS_MACH = sgi/iris-3.5 - -CFLAGS = -DDEBUG -O -cckr -CC = cc -LFLAGS = - -# Directory for installed binary: -BINDIR = /usr/local/bin - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -# Where is the W3 object library? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -include $(WWW)/Library/Implementation/CommonMakefile diff --git a/WWW/Library/snake/Makefile b/WWW/Library/snake/Makefile deleted file mode 100644 index 06db3012..00000000 --- a/WWW/Library/snake/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# Make WWW under unix for HP 700 or 800 (Snake) using cc -# - -# For W3 distribution, machine type for subdirectories -WWW_MACH = snake - -# Distribution point for ASIS repository -ASIS_MACH = hp-700/hpux-8.0 - -CFLAGS = -O -DDEBUG - -# Link with BSD library for getwd() -LFLAGS = -lBSD - -#CC = cc -#CC = gcc - -# Directory for installed binary: -BINDIR = /usr/local/bin - - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -# Where is the W3 object library? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -include $(WWW)/Library/Implementation/CommonMakefile diff --git a/WWW/Library/solaris2/Makefile b/WWW/Library/solaris2/Makefile deleted file mode 100644 index a390cae9..00000000 --- a/WWW/Library/solaris2/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# Make WWW under unix for sun 4 -# - -# For W3 distribution, machine type for subdirectories -WWW_MACH = solaris2 - -# The ASIS repository's name for the machine we are on -ASIS_MACH = sun-4/sunos-5.2 - - -CFLAGS = -O -DDEBUG -DNGROUPS=16 -Dd_namlen=d_reclen -DNO_BCOPY -DSOLARIS2 -DSVR4 -DUSE_DIRENT -LFLAGS = - -# Directory for installed binary: -BINDIR = /usr/local/bin - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -# Where is the W3 object library? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -include $(WWW)/Library/Implementation/CommonMakefile - diff --git a/WWW/Library/sun3/Makefile b/WWW/Library/sun3/Makefile deleted file mode 100644 index ee9c6288..00000000 --- a/WWW/Library/sun3/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# Make WWW under unix for sun 3 -# -# For W3 distribution, machine type for subdirectories -WWW_MACH = sun3 - -# For ASIS installation, the ASIS code for the machine/os -ASIS_MACH = sun-3/sunos-4.1.1 - -# Directory for installed binary: -BINDIR = /usr/local/bin - -CFLAGS = -DDEBUG -O -LFLAGS = - -# Directory for installed binary: -BINDIR = /usr/local/bin - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -# Where is the W3 object library? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -include $(WWW)/Library/Implementation/CommonMakefile diff --git a/WWW/Library/sun4/Makefile b/WWW/Library/sun4/Makefile deleted file mode 100644 index cf14decb..00000000 --- a/WWW/Library/sun4/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# Make WWW under unix for sun 4 -# - -# For W3 distribution, machine type for subdirectories -WWW_MACH = sun4 - -# The ASIS repository's name for the machine we are on -ASIS_MACH = sun-4/sunos-4.1.1 - - -CFLAGS = -DDEBUG -O -LFLAGS = - -# Directory for installed binary: -BINDIR = /usr/local/bin - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -# Where is the W3 object library? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -include $(WWW)/Library/Implementation/CommonMakefile - diff --git a/WWW/Library/svr4/Makefile b/WWW/Library/svr4/Makefile deleted file mode 100644 index a97e6656..00000000 --- a/WWW/Library/svr4/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# Make WWW under svr4 -# - -# For W3 distribution, machine type for subdirectories -WWW_MACH = svr4 - -# The ASIS repository's name for the machine we are on -ASIS_MACH = generic/svr4 - - -CFLAGS = -O -DDEBUG -DUSE_DIRENT -DSVR4 -LFLAGS = -CC = cc - -# Directory for installed binary: -BINDIR = /usr/local/bin - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -# Where is the W3 object library? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -include $(WWW)/Library/Implementation/CommonMakefile diff --git a/WWW/Library/umaxv-m88k/Makefile b/WWW/Library/umaxv-m88k/Makefile deleted file mode 100644 index 79c323c0..00000000 --- a/WWW/Library/umaxv-m88k/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# Make WWW under unix for a.n.other unix system (bsd) -# Use this as a template - -# For W3 distribution, machine type for subdirectories -WWW_MACH = umaxv-m88k - -# The ASIS repository's name for the machine we are on -ASIS_MACH = hardware/os - - -CFLAGS = -O -DDEBUG -D_SYSV3 -LFLAGS = -CC = cc - -# Directory for installed binary: -BINDIR = /usr/local/bin - -# Where is the W3 object library to be installed (not normally done)? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -include $(WWW)/Library/Implementation/CommonMakefile - diff --git a/WWW/Library/unix_x/Makefile b/WWW/Library/unix_x/Makefile deleted file mode 100644 index 23c12453..00000000 --- a/WWW/Library/unix_x/Makefile +++ /dev/null @@ -1,491 +0,0 @@ -# Makefile generated by imake - do not edit! -# $XConsortium: imake.c,v 1.51 89/12/12 12:37:30 jim Exp $ -# -# The cpp used on this machine replaces all newlines and multiple tabs and -# spaces in a macro expansion with a single space. Imake tries to compensate -# for this, but is not always successful. -# - -########################################################################### -# Makefile generated from "Imake.tmpl" and </tmp/IIf.a02602> -# $XConsortium: Imake.tmpl,v 1.77 89/12/18 17:01:37 jim Exp $ -# -# Platform-specific parameters may be set in the appropriate .cf -# configuration files. Site-wide parameters may be set in the file -# site.def. Full rebuilds are recommended if any parameters are changed. -# -# If your C preprocessor doesn't define any unique symbols, you'll need -# to set BOOTSTRAPCFLAGS when rebuilding imake (usually when doing -# "make Makefile", "make Makefiles", or "make World"). -# -# If you absolutely can't get imake to work, you'll need to set the -# variables at the top of each Makefile as well as the dependencies at the -# bottom (makedepend will do this automatically). -# - -########################################################################### -# platform-specific configuration parameters - edit sun.cf to change - -# platform: $XConsortium: sun.cf,v 1.38 89/12/23 16:10:10 jim Exp $ -# operating system: SunOS 4.1.1 - -########################################################################### -# site-specific configuration parameters - edit site.def to change - -# site: $XConsortium: site.def,v 1.21 89/12/06 11:46:50 jim Exp $ - - SHELL = /bin/sh - - TOP = ../../../. - CURRENT_DIR = ./../Library/unix_x - - AR = ar cq - BOOTSTRAPCFLAGS = - CC = gcc -DNOSTDHDRS -fstrength-reduce -fpcc-struct-return -fwritable-strings -traditional - - COMPRESS = compress - CPP = /lib/cpp $(STD_CPP_DEFINES) - PREPROCESSCMD = gcc -DNOSTDHDRS -fstrength-reduce -fpcc-struct-return -fwritable-strings -traditional -E $(STD_CPP_DEFINES) - INSTALL = install - LD = ld - LINT = lint - LINTLIBFLAG = -C - LINTOPTS = -axz - LN = ln -s - MAKE = make - MV = mv - CP = cp - RANLIB = ranlib - RANLIBINSTFLAGS = - RM = rm -f - STD_INCLUDES = - STD_CPP_DEFINES = - STD_DEFINES = - EXTRA_LOAD_FLAGS = - EXTRA_LIBRARIES = - TAGS = ctags - - SHAREDCODEDEF = -DSHAREDCODE - SHLIBDEF = -DSUNSHLIB - - PROTO_DEFINES = - - INSTPGMFLAGS = - - INSTBINFLAGS = -m 0755 - INSTUIDFLAGS = -m 4755 - INSTLIBFLAGS = -m 0664 - INSTINCFLAGS = -m 0444 - INSTMANFLAGS = -m 0444 - INSTDATFLAGS = -m 0444 - INSTKMEMFLAGS = -m 4755 - - DESTDIR = - - TOP_INCLUDES = -I$(INCROOT) - - CDEBUGFLAGS = -O - CCOPTIONS = - COMPATFLAGS = - - ALLINCLUDES = $(STD_INCLUDES) $(TOP_INCLUDES) $(INCLUDES) $(EXTRA_INCLUDES) - ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(DEFINES) $(COMPATFLAGS) - CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES) - LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) - LDLIBS = $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) - LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) - LDCOMBINEFLAGS = -X -r - - MACROFILE = sun.cf - RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut - - IMAKE_DEFINES = - - IRULESRC = $(CONFIGDIR) - IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES) - - ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/Imake.rules \ - $(IRULESRC)/Project.tmpl $(IRULESRC)/site.def \ - $(IRULESRC)/$(MACROFILE) $(EXTRA_ICONFIGFILES) - -########################################################################### -# X Window System Build Parameters -# $XConsortium: Project.tmpl,v 1.63 89/12/18 16:46:44 jim Exp $ - -########################################################################### -# X Window System make variables; this need to be coordinated with rules -# $XConsortium: Project.tmpl,v 1.63 89/12/18 16:46:44 jim Exp $ - - PATHSEP = / - USRLIBDIR = $(DESTDIR)/usr/lib - BINDIR = $(DESTDIR)/usr/bin/X11 - INCROOT = $(DESTDIR)/usr/include - BUILDINCROOT = $(TOP) - BUILDINCDIR = $(BUILDINCROOT)/X11 - BUILDINCTOP = .. - INCDIR = $(INCROOT)/X11 - ADMDIR = $(DESTDIR)/usr/adm - LIBDIR = $(USRLIBDIR)/X11 - CONFIGDIR = $(LIBDIR)/config - LINTLIBDIR = $(USRLIBDIR)/lint - - FONTDIR = $(LIBDIR)/fonts - XINITDIR = $(LIBDIR)/xinit - XDMDIR = $(LIBDIR)/xdm - AWMDIR = $(LIBDIR)/awm - TWMDIR = $(LIBDIR)/twm - GWMDIR = $(LIBDIR)/gwm - MANPATH = $(DESTDIR)/usr/man - MANSOURCEPATH = $(MANPATH)/man - MANDIR = $(MANSOURCEPATH)n - LIBMANDIR = $(MANSOURCEPATH)3 - XAPPLOADDIR = $(LIBDIR)/app-defaults - - SOXLIBREV = 4.2 - SOXTREV = 4.0 - SOXAWREV = 4.0 - SOOLDXREV = 4.0 - SOXMUREV = 4.0 - SOXEXTREV = 4.0 - - FONTCFLAGS = -t - - INSTAPPFLAGS = $(INSTDATFLAGS) - - IMAKE = imake - DEPEND = makedepend - RGB = rgb - FONTC = bdftosnf - MKFONTDIR = mkfontdir - MKDIRHIER = /bin/sh $(BINDIR)/mkdirhier.sh - - CONFIGSRC = $(TOP)/config - CLIENTSRC = $(TOP)/clients - DEMOSRC = $(TOP)/demos - LIBSRC = $(TOP)/lib - FONTSRC = $(TOP)/fonts - INCLUDESRC = $(TOP)/X11 - SERVERSRC = $(TOP)/server - UTILSRC = $(TOP)/util - SCRIPTSRC = $(UTILSRC)/scripts - EXAMPLESRC = $(TOP)/examples - CONTRIBSRC = $(TOP)/../contrib - DOCSRC = $(TOP)/doc - RGBSRC = $(TOP)/rgb - DEPENDSRC = $(UTILSRC)/makedepend - IMAKESRC = $(CONFIGSRC) - XAUTHSRC = $(LIBSRC)/Xau - XLIBSRC = $(LIBSRC)/X - XMUSRC = $(LIBSRC)/Xmu - TOOLKITSRC = $(LIBSRC)/Xt - AWIDGETSRC = $(LIBSRC)/Xaw - OLDXLIBSRC = $(LIBSRC)/oldX - XDMCPLIBSRC = $(LIBSRC)/Xdmcp - BDFTOSNFSRC = $(FONTSRC)/bdftosnf - MKFONTDIRSRC = $(FONTSRC)/mkfontdir - EXTENSIONSRC = $(TOP)/extensions - - DEPEXTENSIONLIB = $(USRLIBDIR)/libXext.a - EXTENSIONLIB = -lXext - - DEPXLIB = $(DEPEXTENSIONLIB) - XLIB = $(EXTENSIONLIB) -lX11 - - DEPXAUTHLIB = $(USRLIBDIR)/libXau.a - XAUTHLIB = -lXau - - DEPXMULIB = - XMULIB = -lXmu - - DEPOLDXLIB = - OLDXLIB = -loldX - - DEPXTOOLLIB = - XTOOLLIB = -lXt - - DEPXAWLIB = - XAWLIB = -lXaw - - LINTEXTENSIONLIB = $(USRLIBDIR)/llib-lXext.ln - LINTXLIB = $(USRLIBDIR)/llib-lX11.ln - LINTXMU = $(USRLIBDIR)/llib-lXmu.ln - LINTXTOOL = $(USRLIBDIR)/llib-lXt.ln - LINTXAW = $(USRLIBDIR)/llib-lXaw.ln - - DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) - - DEPLIBS1 = $(DEPLIBS) - DEPLIBS2 = $(DEPLIBS) - DEPLIBS3 = $(DEPLIBS) - -########################################################################### -# Imake rules for building libraries, programs, scripts, and data files -# rules: $XConsortium: Imake.rules,v 1.67 89/12/18 17:14:15 jim Exp $ - -########################################################################### -# start of Imakefile - -# Make WWW under unix for a.n.other unix system (bsd) -# Use this as a template - -TK_WWW_SOURCE_PATH=/a/dxcern/userd/tbl/hypertext/WWW/TkWWW/Tcl - -TK_WWW_INSTALL_PATH=/a/dxcern/userd/tbl/hypertext/WWW/TkWWW/$WWW_MACH - -TK_WWW_HOME_PAGE=http://www.w3.org/default.html -TK_WWW_START_PAGE=$(TK_WWW_HOME_PAGE) - -CC = gcc -fno-builtin -Wall - -CDEBUGFLAGS = -O3 -pipe - -COMPATFLAGS = -I/afs/athena.mit.edu/course/other/cdsdev/www-compat -CCOPTIONS = - -BINDIR = $(TK_WWW_INSTALL_PATH) - -# For W3 distribution, machine type for subdirectories -WWW_MACH = unix_x - -# The ASIS repository's name for the machine we are on -ASIS_MACH = hardware/os - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = /tmp - -# Common Makefile for W3 Library Code -# ----------------------------------- -# -# (c) CERN 1990, 1991 -- see Copyright.html for conditions -# -# This file should be invariant between systems. -# DEPENDENCIES NOT COMPLETE - -# -# make Compile and link the software (private version) -# make clean Remove intermediate files - -WC = $(WWW)/Library -CMN = $(WWW)/Library/Implementation/ - -# Where shall we put the objects and built library? - -LOB = $(WTMP)/Library/$(WWW_MACH) - -# Bug: This path, if relative, is taken relative to the directory -# in which this makefile is, not the pwd. This screws up the -# recursive invocation - -VC = 2.14 - -CFLAGS2 = $(CFLAGS) -I$(CMN) - -CERNLIBBIN = $(WWW)/bin - -COMMON = $(LOB)/HTParse.o $(LOB)/HTAccess.o $(LOB)/HTTP.o \ - $(LOB)/HTBTree.o \ - $(LOB)/HTFile.o $(LOB)/HTFTP.o $(LOB)/HTTCP.o \ - $(LOB)/SGML.o $(LOB)/HTMLDTD.o $(LOB)/HTChunk.o \ - $(LOB)/HTPlain.o $(LOB)/HTWriter.o $(LOB)/HTFWriter.o \ - $(LOB)/HTMLGen.o \ - $(LOB)/HTAtom.o $(LOB)/HTAnchor.o $(LOB)/HTStyle.o \ - $(LOB)/HTList.o $(LOB)/HTString.o $(LOB)/HTAlert.o \ - $(LOB)/HTRules.o $(LOB)/HTFormat.o $(LOB)/HTInit.o $(LOB)/HTMIME.o \ - $(LOB)/HTHistory.o $(LOB)/HTNews.o $(LOB)/HTGopher.o \ - $(LOB)/HTTelnet.o $(LOB)/HTWSRC.o $(HTWAIS) - -CFILES = $(CMN)HTParse.c $(CMN)HTAccess.c $(CMN)HTTP.c $(CMN)HTBTree.c \ - $(CMN)HTFile.c \ - $(CMN)HTFTP.c $(CMN)HTTCP.c $(CMN)SGML.c \ - $(CMN)HTMLDTD.c \ - $(CMN)HTPlain.c $(CMN)HTWriter.c $(CMN)HTFWriter.c $(CMN)HTMLGen.c \ - $(CMN)HTChunk.c $(CMN)HTAtom.c $(CMN)HTAnchor.c $(CMN)HTStyle.c \ - $(CMN)HTList.c $(CMN)HTString.c $(CMN)HTAlert.c $(CMN)HTRules.c \ - $(CMN)HTFormat.c $(CMN)HTInit.c $(CMN)HTMIME.c $(CMN)HTHistory.c \ - $(CMN)HTNews.c $(CMN)HTGopher.c $(CMN)HTTelnet.c \ - $(CMN)HTWAIS.c $(CMN)HTWSRC.c - -HFILES = $(CMN)HTParse.h $(CMN)HTAccess.h $(CMN)HTTP.h $(CMN)HTBTree.h \ - $(CMN)HTFile.h \ - $(CMN)HTFTP.h $(CMN)HTTCP.h \ - $(CMN)SGML.h $(CMN)HTML.h $(CMN)HTMLDTD.h $(CMN)HTChunk.h \ - $(CMN)HTPlain.h $(CMN)HTWriter.h \ - $(CMN)HTFWriter.h $(CMN)HTMLGen.h \ - $(CMN)HTStream.h \ - $(CMN)HTAtom.h $(CMN)HTAnchor.h $(CMN)HTStyle.h \ - $(CMN)HTList.h \ - $(CMN)HTString.h $(CMN)HTAlert.h $(CMN)HTRules.h \ - $(CMN)HTFormat.h $(CMN)HTInit.h \ - $(CMN)HTMIME.h $(CMN)HTHistory.h $(CMN)HTNews.h \ - $(CMN)HTGopher.h \ - $(CMN)HTUtils.h $(CMN)tcp.h $(CMN)WWW.h $(CMN)HText.h \ - $(CMN)HTTelnet.h \ - $(CMN)HTWAIS.h $(CMN)HTWSRC.h - -SOURCES = $(CFILES) $(HFILES) $(CMN)Version.make $(CMN)CommonMakefile \ - $(WWW)/README.txt $(WWW)/Copyright.txt $(WWW)/BUILD -SPECIFIC = $(WWW)/All - -# Library -# -# On SGI, ranlib is unnecessary and does not exist so we ignore errors -# for that step -all: $(LOB)/libwww.a - $(MV) $(LOB)/libwww.a $(WC)/$(WWW_MACH) - -$(LOB)/libwww.a : $(COMMON) - ar r $(LOB)/libwww.a $(COMMON) - -ranlib $(LOB)/libwww.a - -# Clean up everything generatable except final products -clean :: - $(RM) $(LOB) - -# Clean up everything generatable including final products - -cleanall :: clean - $(RM) $(LOB)/libwww.a - -# Common code -# ----------- - -# Directory for object files - .created checks it exists - -OE = $(LOB)/.created -$(OE) : - -mkdir $(WTMP) - -mkdir $(WTMP)/Library - -mkdir $(WTMP)/Library/$(WWW_MACH) - touch $@ - -$(LOB)/HTList.o : $(OE) $(CMN)HTList.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTList.c - -$(LOB)/HTAnchor.o : $(OE) $(CMN)HTAnchor.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAnchor.c - -$(LOB)/HTFormat.o : $(OE) $(CMN)HTFormat.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFormat.c - -$(LOB)/HTInit.o : $(OE) $(CMN)HTInit.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTInit.c - -$(LOB)/HTMIME.o : $(OE) $(CMN)HTMIME.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMIME.c - -$(LOB)/HTHistory.o : $(OE) $(CMN)HTHistory.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTHistory.c - -$(LOB)/HTNews.o : $(OE) $(CMN)HTNews.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTNews.c - -$(LOB)/HTGopher.o : $(OE) $(CMN)HTGopher.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTGopher.c - -$(LOB)/HTTelnet.o : $(OE) $(CMN)HTTelnet.c $(CMN)HTUtils.h $(CMN)HTTelnet.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTelnet.c - -$(LOB)/HTStyle.o : $(OE) $(CMN)HTStyle.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTStyle.c - -$(LOB)/HTAtom.o : $(OE) $(CMN)HTAtom.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAtom.c - -$(LOB)/HTChunk.o : $(OE) $(CMN)HTChunk.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTChunk.c - -$(LOB)/HTString.o : $(OE) $(CMN)HTString.c $(CMN)HTUtils.h $(CMN)Version.make - $(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTString.c - -$(LOB)/HTAlert.o : $(OE) $(CMN)HTAlert.c $(CMN)HTUtils.h $(CMN)Version.make - $(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTAlert.c - -$(LOB)/HTRules.o : $(OE) $(CMN)HTRules.c $(CMN)HTUtils.h $(CMN)Version.make - $(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTRules.c - -$(LOB)/SGML.o : $(OE) $(CMN)SGML.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)SGML.c - -$(LOB)/HTMLGen.o : $(OE) $(CMN)HTMLGen.c $(CMN)HTUtils.h $(CMN)HTMLDTD.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMLGen.c - -$(LOB)/HTMLDTD.o : $(OE) $(CMN)HTMLDTD.c $(CMN)SGML.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMLDTD.c - -$(LOB)/HTPlain.o : $(OE) $(CMN)HTPlain.c $(CMN)HTPlain.h $(CMN)HTStream.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTPlain.c - -$(LOB)/HTWAIS.o : $(OE) $(CMN)HTWAIS.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(WAISINC) $(CMN)HTWAIS.c - -$(LOB)/HTWSRC.o : $(OE) $(CMN)HTWSRC.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTWSRC.c - -$(LOB)/HTWriter.o : $(OE) $(CMN)HTWriter.c $(CMN)HTWriter.h $(CMN)HTStream.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTWriter.c - -$(LOB)/HTFWriter.o : $(OE) $(CMN)HTFWriter.c $(CMN)HTFWriter.h $(CMN)HTStream.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFWriter.c - -# Communications & Files - -$(LOB)/HTTP.o : $(OE) $(CMN)HTTP.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTP.c - -$(LOB)/HTTCP.o : $(OE) $(CMN)HTTCP.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTCP.c - -$(LOB)/HTBTree.o : $(OE) $(CMN)HTBTree.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTBTree.c - -$(LOB)/HTFile.o : $(OE) $(CMN)HTFile.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFile.c - -$(LOB)/HTFTP.o : $(OE) $(CMN)HTFTP.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFTP.c - -$(LOB)/HTAccess.o : $(OE) $(CMN)HTAccess.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAccess.c - -$(LOB)/HTParse.o : $(OE) $(CMN)HTParse.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTParse.c - -########################################################################### -# common rules for all Makefiles - do not edit - -emptyrule:: - -clean:: - $(RM_CMD) \#* - -Makefile:: - -@if [ -f Makefile ]; then \ - echo " $(RM) Makefile.bak; $(MV) Makefile Makefile.bak"; \ - $(RM) Makefile.bak; $(MV) Makefile Makefile.bak; \ - else exit 0; fi - $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) - -tags:: - $(TAGS) -w *.[ch] - $(TAGS) -xw *.[ch] > TAGS - -########################################################################### -# empty rules for directories that do not have SUBDIRS - do not edit - -install:: - @echo "install in $(CURRENT_DIR) done" - -install.man:: - @echo "install.man in $(CURRENT_DIR) done" - -Makefiles:: - -includes:: - -########################################################################### -# dependencies generated by makedepend - diff --git a/WWW/Library/vax_ultrix/Makefile b/WWW/Library/vax_ultrix/Makefile deleted file mode 100644 index 2caf766c..00000000 --- a/WWW/Library/vax_ultrix/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# Make WWW under ultrix with gcc -# - - -# For W3 distribution, machine type for subdirectories -WWW_MACH = vax_ultrix - -# For ASIS installation, the ASIS code for the machine/os -ASIS_MACH = none - -CC = gcc -CFLAGS = -O -DDEBUG -Wall -LFLAGS = -O - -# This is bug fix for out-of-date ultrix on cernvax -# LFLAGS = -O pfcode.o -lresolv - -# Directory for installed binary: -BINDIR = /usr/local/unix - - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = /tmp - - -# Where is the W3 object library? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -include $(WWW)/Library/Implementation/CommonMakefile diff --git a/config.hin b/config.hin index 11ac7008..594dc41e 100644 --- a/config.hin +++ b/config.hin @@ -44,6 +44,7 @@ #undef HAVE_SYS_IOCTL_H /* have <sys/ioctl.h> */ #undef HAVE_SYS_NDIR_H /* defined by AC_HEADER_DIRENT */ #undef HAVE_SYS_WAIT_H /* have <sys/wait.h> */ +#undef HAVE_TERMIO_H /* have <termio.h> */ #undef HAVE_TERMIOS_H /* have <termios.h> */ #undef HAVE_TTYTYPE #undef HAVE_TYPE_UNIONWAIT /* CF_UNION_WAIT */ @@ -109,7 +110,6 @@ #undef mode_t /* defined by AC_TYPE_MODE_T */ #undef vfork /* defined by AC_FUNC_FORK */ /* FIXME:ALLOW_USERS_TO_CHANGE_EXEC_WITHIN_OPTIONS */ -/* FIXME:BSDI */ /* FIXME:DECLARE_WAIS_LOGFILES */ /* FIXME:DGUX */ /* FIXME:DGUX_OLD */ diff --git a/configure b/configure index c3bd9b97..beda53fa 100755 --- a/configure +++ b/configure @@ -7113,13 +7113,14 @@ else fi +echo "$ac_t""$use_8bit_toupper" 1>&6 test $use_8bit_toupper != no && cat >> confdefs.h <<\EOF #define EXP_8BIT_TOUPPER 1 EOF echo $ac_n "checking if color-style code should be used""... $ac_c" 1>&6 -echo "configure:7123: checking if color-style code should be used" >&5 +echo "configure:7124: checking if color-style code should be used" >&5 # Check whether --enable-color-style or --disable-color-style was given. if test "${enable_color_style+set}" = set; then @@ -7164,10 +7165,10 @@ no) #define USE_COLOR_STYLE 1 EOF - echo "$ac_t""curses-style" 1>&6 + echo "$ac_t""yes" 1>&6 echo $ac_n "checking for location of style-sheet file""... $ac_c" 1>&6 -echo "configure:7171: checking for location of style-sheet file" >&5 +echo "configure:7172: checking for location of style-sheet file" >&5 LYNX_LSS_FILE=$cf_libdir/lynx.lss cat >> confdefs.h <<EOF #define LYNX_LSS_FILE "$LYNX_LSS_FILE" @@ -7185,7 +7186,7 @@ test ".$ac_cv_func_use_default_colors" = ".yes" && use_dft_colors=maybe if test "$use_dft_colors" != no ; then echo $ac_n "checking if you want to use default-colors""... $ac_c" 1>&6 -echo "configure:7189: checking if you want to use default-colors" >&5 +echo "configure:7190: checking if you want to use default-colors" >&5 # Check whether --enable-default-colors or --disable-default-colors was given. if test "${enable_default_colors+set}" = set; then @@ -7210,7 +7211,7 @@ EOF fi echo $ac_n "checking if you want to use extended HTML DTD logic""... $ac_c" 1>&6 -echo "configure:7214: checking if you want to use extended HTML DTD logic" >&5 +echo "configure:7215: checking if you want to use extended HTML DTD logic" >&5 # Check whether --enable-extended-dtd or --disable-extended-dtd was given. if test "${enable_extended_dtd+set}" = set; then @@ -7234,7 +7235,7 @@ EOF echo $ac_n "checking if you want to use external commands""... $ac_c" 1>&6 -echo "configure:7238: checking if you want to use external commands" >&5 +echo "configure:7239: checking if you want to use external commands" >&5 # Check whether --enable-externs or --disable-externs was given. if test "${enable_externs+set}" = set; then @@ -7258,7 +7259,7 @@ EOF echo $ac_n "checking if you want to use setfont support""... $ac_c" 1>&6 -echo "configure:7262: checking if you want to use setfont support" >&5 +echo "configure:7263: checking if you want to use setfont support" >&5 # Check whether --enable-font-switch or --disable-font-switch was given. if test "${enable_font_switch+set}" = set; then @@ -7282,7 +7283,7 @@ EOF echo $ac_n "checking if you want internal-links feature""... $ac_c" 1>&6 -echo "configure:7286: checking if you want internal-links feature" >&5 +echo "configure:7287: checking if you want internal-links feature" >&5 # Check whether --enable-internal-links or --disable-internal-links was given. if test "${enable_internal_links+set}" = set; then @@ -7306,7 +7307,7 @@ EOF echo $ac_n "checking if you want to fork NSL requests""... $ac_c" 1>&6 -echo "configure:7310: checking if you want to fork NSL requests" >&5 +echo "configure:7311: checking if you want to fork NSL requests" >&5 # Check whether --enable-nsl-fork or --disable-nsl-fork was given. if test "${enable_nsl_fork+set}" = set; then @@ -7330,7 +7331,7 @@ EOF echo $ac_n "checking if you want to underline links""... $ac_c" 1>&6 -echo "configure:7334: checking if you want to underline links" >&5 +echo "configure:7335: checking if you want to underline links" >&5 # Check whether --enable-underlines or --disable-underlines was given. if test "${enable_underlines+set}" = set; then @@ -7354,7 +7355,7 @@ EOF echo $ac_n "checking if you want to use zlib for decompression of some gzip files""... $ac_c" 1>&6 -echo "configure:7358: checking if you want to use zlib for decompression of some gzip files" >&5 +echo "configure:7359: checking if you want to use zlib for decompression of some gzip files" >&5 # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then @@ -7371,12 +7372,12 @@ if test ".$use_zlib" != ".no" ; then cf_cv_have_lib_z=no cf_libdir="" echo $ac_n "checking for gzopen""... $ac_c" 1>&6 -echo "configure:7375: checking for gzopen" >&5 +echo "configure:7376: checking for gzopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_gzopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7380 "configure" +#line 7381 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gzopen(); below. */ @@ -7399,7 +7400,7 @@ gzopen(); ; return 0; } EOF -if { (eval echo configure:7403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gzopen=yes" else @@ -7419,17 +7420,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for gzopen in -lz""... $ac_c" 1>&6 -echo "configure:7423: checking for gzopen in -lz" >&5 +echo "configure:7424: checking for gzopen in -lz" >&5 LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 7426 "configure" +#line 7427 "configure" #include "confdefs.h" #include <zlib.h> int main() { gzopen("name","mode") ; return 0; } EOF -if { (eval echo configure:7433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cf_cv_have_lib_z=yes @@ -7456,17 +7457,17 @@ test "$prefix" != /usr && cf_search="$cf_search /usr/lib /usr/lib/z" for cf_libdir in $cf_search do echo $ac_n "checking for -lz in $cf_libdir""... $ac_c" 1>&6 -echo "configure:7460: checking for -lz in $cf_libdir" >&5 +echo "configure:7461: checking for -lz in $cf_libdir" >&5 LIBS="-L$cf_libdir -lz $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 7463 "configure" +#line 7464 "configure" #include "confdefs.h" #include <zlib.h> int main() { gzopen("name","mode") ; return 0; } EOF -if { (eval echo configure:7470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cf_cv_have_lib_z=yes @@ -7507,7 +7508,7 @@ fi # All DirEd functions that were enabled on compilation can be disabled # or modified at run time via DIRED_MENU symbols in lynx.cfg. echo $ac_n "checking if directory-editor code should be used""... $ac_c" 1>&6 -echo "configure:7511: checking if directory-editor code should be used" >&5 +echo "configure:7512: checking if directory-editor code should be used" >&5 # Check whether --enable-dired or --disable-dired was given. if test "${enable_dired+set}" = set; then @@ -7533,7 +7534,7 @@ EOF echo $ac_n "checking if you wish to allow extracting from archives via DirEd""... $ac_c" 1>&6 -echo "configure:7537: checking if you wish to allow extracting from archives via DirEd" >&5 +echo "configure:7538: checking if you wish to allow extracting from archives via DirEd" >&5 # Check whether --enable-dired-archive or --disable-dired-archive was given. if test "${enable_dired_archive+set}" = set; then @@ -7552,7 +7553,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you wish to allow users to redefine DirEd keys""... $ac_c" 1>&6 -echo "configure:7556: checking if you wish to allow users to redefine DirEd keys" >&5 +echo "configure:7557: checking if you wish to allow users to redefine DirEd keys" >&5 # Check whether --enable-dired-override or --disable-dired-override was given. if test "${enable_dired_override+set}" = set; then @@ -7578,7 +7579,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you wish to allow permissions commands via DirEd""... $ac_c" 1>&6 -echo "configure:7582: checking if you wish to allow permissions commands via DirEd" >&5 +echo "configure:7583: checking if you wish to allow permissions commands via DirEd" >&5 # Check whether --enable-dired-permit or --disable-dired-permit was given. if test "${enable_dired_permit+set}" = set; then @@ -7604,7 +7605,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you wish to allow executable-permission commands via DirEd""... $ac_c" 1>&6 -echo "configure:7608: checking if you wish to allow executable-permission commands via DirEd" >&5 +echo "configure:7609: checking if you wish to allow executable-permission commands via DirEd" >&5 # Check whether --enable-dired-xpermit or --disable-dired-xpermit was given. if test "${enable_dired_xpermit+set}" = set; then @@ -7623,7 +7624,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you wish to allow "tar" commands from DirEd""... $ac_c" 1>&6 -echo "configure:7627: checking if you wish to allow "tar" commands from DirEd" >&5 +echo "configure:7628: checking if you wish to allow "tar" commands from DirEd" >&5 # Check whether --enable-dired-tar or --disable-dired-tar was given. if test "${enable_dired_tar+set}" = set; then @@ -7649,7 +7650,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you wish to allow "uudecode" commands from DirEd""... $ac_c" 1>&6 -echo "configure:7653: checking if you wish to allow "uudecode" commands from DirEd" >&5 +echo "configure:7654: checking if you wish to allow "uudecode" commands from DirEd" >&5 # Check whether --enable-dired-uudecode or --disable-dired-uudecode was given. if test "${enable_dired_uudecode+set}" = set; then @@ -7675,7 +7676,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you wish to allow "zip" and "unzip" commands from DirEd""... $ac_c" 1>&6 -echo "configure:7679: checking if you wish to allow "zip" and "unzip" commands from DirEd" >&5 +echo "configure:7680: checking if you wish to allow "zip" and "unzip" commands from DirEd" >&5 # Check whether --enable-dired-zip or --disable-dired-zip was given. if test "${enable_dired_zip+set}" = set; then @@ -7701,7 +7702,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you wish to allow "gzip" and "gunzip" commands from DirEd""... $ac_c" 1>&6 -echo "configure:7705: checking if you wish to allow "gzip" and "gunzip" commands from DirEd" >&5 +echo "configure:7706: checking if you wish to allow "gzip" and "gunzip" commands from DirEd" >&5 # Check whether --enable-dired-gzip or --disable-dired-gzip was given. if test "${enable_dired_gzip+set}" = set; then @@ -7728,7 +7729,7 @@ fi fi echo $ac_n "checking if you want long-directory listings""... $ac_c" 1>&6 -echo "configure:7732: checking if you want long-directory listings" >&5 +echo "configure:7733: checking if you want long-directory listings" >&5 # Check whether --enable-long-list or --disable-long-list was given. if test "${enable_long_list+set}" = set; then @@ -7754,7 +7755,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if parent-directory references are permitted""... $ac_c" 1>&6 -echo "configure:7758: checking if parent-directory references are permitted" >&5 +echo "configure:7759: checking if parent-directory references are permitted" >&5 # Check whether --enable-parent-dir-refs or --disable-parent-dir-refs was given. if test "${enable_parent_dir_refs+set}" = set; then diff --git a/configure.in b/configure.in index 9a3e37af..49051ce8 100644 --- a/configure.in +++ b/configure.in @@ -392,6 +392,7 @@ CF_ARG_ENABLE(8bit-toupper, [ --enable-8bit-toupper use experimental 8-bit case-conversion], [use_8bit_toupper=$enableval], [use_8bit_toupper=no]) +AC_MSG_RESULT($use_8bit_toupper) test $use_8bit_toupper != no && AC_DEFINE(EXP_8BIT_TOUPPER) AC_MSG_CHECKING(if color-style code should be used) @@ -418,7 +419,7 @@ no) ;; *) AC_DEFINE(USE_COLOR_STYLE) - AC_MSG_RESULT(curses-style) + AC_MSG_RESULT(yes) AC_MSG_CHECKING(for location of style-sheet file) LYNX_LSS_FILE=$cf_libdir/lynx.lss diff --git a/docs/CHANGES2.8 b/docs/CHANGES2.8 index 6d6fb7f3..57b38438 100644 --- a/docs/CHANGES2.8 +++ b/docs/CHANGES2.8 @@ -8,7 +8,6 @@ * modify makefile.in so that "make install-cfg" does not edit lynx.cfg to point at local helpfiles, while "make install-help" will now do that (reported by LP). - TD -* one more patch to UPPER8 function. - LP 1998-03-07 * move ifdef's for EXP_8BIT_TOUPPER inside UPPER8 function to allow check for DOS/WINDOWS display charsets. - LP diff --git a/src/LYCharSets.c b/src/LYCharSets.c index 2f9e4362..0ed8ba64 100644 --- a/src/LYCharSets.c +++ b/src/LYCharSets.c @@ -23,6 +23,7 @@ extern BOOL HTPassHighCtrlNum; extern HTCJKlang HTCJK; PUBLIC HTkcode kanji_code = NOKANJI; PUBLIC BOOLEAN LYHaveCJKCharacterSet = FALSE; +PUBLIC BOOLEAN DisplayCharsetMatchLocale = TRUE; extern void UCInit NOARGS; extern int UCInitialized; PUBLIC int LYNumCharsets = 0; /* Will be initialized later by UC_Register. */ @@ -664,6 +665,42 @@ PUBLIC void HTMLSetHaveCJKCharacterSet ARGS1(int,i) } /* + * Function to set the DisplayCharsetMatchLocale value + * based on the selected character set. + * It is used in UPPER8 for 8bit case-insensitive search + * by matching def7_uni.tbl images. - LP + */ +PRIVATE void HTMLSetDisplayCharsetMatchLocale ARGS1(int,i) +{ + if (strncasecomp(LYCharSet_UC[i].MIMEname, "cp", 2) || + strncasecomp(LYCharSet_UC[i].MIMEname, "windows", 7)) { + /* + ** Assume dos/windows displays usually on remote terminal, + ** so rarely match locale. + ** (in fact, MS Windows codepoints locale are never seen on UNIX). + */ + DisplayCharsetMatchLocale = FALSE; + } else { + DisplayCharsetMatchLocale = TRUE; + } + +#if !defined(LOCALE) + DisplayCharsetMatchLocale = FALSE; +#endif +#if defined(EXP_8BIT_TOUPPER) + /* + ** Force disable locale, + ** but we have no intention to pass CJK via UCTransChar if that happened. + ** Let someone from CJK correct this if necessary. + */ + if (!LYHaveCJKCharacterSet) + DisplayCharsetMatchLocale = FALSE; +#endif + + return; +} + +/* * Entity names -- Ordered by ISO Latin 1 value. * --------------------------------------------- * For conversions of DECIMAL escaped entities. @@ -910,6 +947,7 @@ PUBLIC void HTMLUseCharacterSet ARGS1(int,i) p_entity_values = LYCharSets[i]; HTMLSetCharacterHandling(i); HTMLSetHaveCJKCharacterSet(i); + HTMLSetDisplayCharsetMatchLocale(i); return; } diff --git a/src/LYCharSets.h b/src/LYCharSets.h index 17ee98e2..7af57cdc 100644 --- a/src/LYCharSets.h +++ b/src/LYCharSets.h @@ -7,6 +7,7 @@ #endif /* !UCMAP_H */ extern BOOLEAN LYHaveCJKCharacterSet; +extern BOOLEAN DisplayCharsetMatchLocale; /* * LYchar_set_name[current_char_set] points to the currently active set. diff --git a/src/LYMain.c b/src/LYMain.c index 2e600b1e..03591d21 100644 --- a/src/LYMain.c +++ b/src/LYMain.c @@ -742,7 +742,7 @@ else {init_ctrl_break[0] = 1;} StrAllocCat(lynx_temp_space, ":"); } #else -#ifndef __DJGPP__ +#if !defined(__DJGPP__) && !defined(_WINDOWS) if (((len = strlen(lynx_temp_space)) > 1) && lynx_temp_space[len-1] != '/') { StrAllocCat(lynx_temp_space, "/"); @@ -752,7 +752,7 @@ else {init_ctrl_break[0] = 1;} lynx_temp_space[len-1] != '\\') { StrAllocCat(lynx_temp_space, "\\"); } -#endif /* __DJGPP__ */ +#endif /* !__DJGPP__ && !_WINDOWS */ #endif /* VMS */ #ifdef VMS StrAllocCopy(mail_adrs, MAIL_ADRS); @@ -1257,11 +1257,7 @@ else {init_ctrl_break[0] = 1;} /* * Process the configuration file. */ - if (TRACE) { - fprintf(stderr, - "Loading cfg file '%s'.\n", lynx_cfg_file); - } - read_cfg(lynx_cfg_file); + read_cfg(lynx_cfg_file, "main program", 1); FREE(lynx_cfg_file); HTSwitchDTD(New_DTD); diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c index 736aeab4..4a57dcdc 100644 --- a/src/LYReadCFG.c +++ b/src/LYReadCFG.c @@ -440,8 +440,10 @@ PRIVATE void parse_color ARGS1( /* * Process the configuration file (lynx.cfg). */ -PUBLIC void read_cfg ARGS1( - char *, cfg_filename) +PUBLIC void read_cfg ARGS3( + char *, cfg_filename, + char *, parent_filename, + int, nesting_level) { FILE *fp; char buffer[501]; @@ -449,6 +451,22 @@ PUBLIC void read_cfg ARGS1( char *cp, *cp1; int i, j, len; + if (TRACE) { + fprintf(stderr, + "Loading cfg file '%s'.\n", cfg_filename); + } + /* + * Don't get hung up by an include file loop. Arbitrary max depth + * of 10. - BL + */ + if (nesting_level > 10) { + fprintf(stderr, + "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n", + nesting_level - 1); + fprintf(stderr,"Last attempted include was '%s',\n", cfg_filename); + fprintf(stderr,"included from '%s'.\n", parent_filename); + exit(-1); + } /* * Locate and open the file. */ @@ -620,6 +638,7 @@ PUBLIC void read_cfg ARGS1( } else if (!strncasecomp(buffer, "DEFAULT_CACHE_SIZE:", 19)) { HTCacheSize = atoi(buffer+19); + if (HTCacheSize < 2) HTCacheSize = 2; } else if (!system_editor && !strncasecomp(buffer, "DEFAULT_EDITOR:", 15)) { @@ -766,7 +785,10 @@ PUBLIC void read_cfg ARGS1( break; case 'I': - if (!strncasecomp(buffer, "INFOSECS:", 9)) { + if (!strncasecomp(buffer, "include:", 8)) { + strcpy(temp, buffer+8); + read_cfg(temp, cfg_filename, nesting_level + 1); + } else if (!strncasecomp(buffer, "INFOSECS:", 9)) { strcpy(temp, buffer+9); for (i = 0; temp[i]; i++) { if (!isdigit(temp[i])) { diff --git a/src/LYReadCFG.h b/src/LYReadCFG.h index 5e94f0d8..63050ee1 100644 --- a/src/LYReadCFG.h +++ b/src/LYReadCFG.h @@ -43,7 +43,7 @@ extern int default_bg; extern int check_color PARAMS((char * color, int the_default)); #endif -extern void read_cfg PARAMS((char *cfg_filename)); +extern void read_cfg PARAMS((char *cfg_filename, char *parent_filename, int nesting_level)); extern BOOLEAN have_read_cfg; #endif /* LYREADCFG_H */ diff --git a/src/LYStrings.c b/src/LYStrings.c index 2111b918..b9cfd7bd 100644 --- a/src/LYStrings.c +++ b/src/LYStrings.c @@ -1627,8 +1627,8 @@ PUBLIC char * SNACat ARGS3( ** may be interpreted as equal, but this side effect is negligible ** if the user search string is more than one character long. - LP ** -** Currently we enable new technique only for DOS/WINDOWS display charsets -** and also for EXP_8BIT_TOUPPER compilation symbol. +** We enable new technique only if DisplayCharsetMatchLocale = FALSE +** (see description in LYCharSets.c) */ PUBLIC int UPPER8 ARGS2(int,ch1, int,ch2) { @@ -1640,21 +1640,15 @@ PUBLIC int UPPER8 ARGS2(int,ch1, int,ch2) /* case-insensitive match for upper half */ if ((unsigned char)ch1 > 127 && (unsigned char)ch2 >127) { - CONST char *disp_charset; - disp_charset = LYCharSet_UC[current_char_set].MIMEname; - -#if !defined(EXP_8BIT_TOUPPER) - if (!(strncasecomp(disp_charset, "cp", 2) || - strncasecomp(disp_charset, "windows", 7))) { - - return(TOUPPER(ch1) - TOUPPER(ch2)); /* old-style */ - } else -#endif + if (DisplayCharsetMatchLocale) + return(TOUPPER(ch1) - TOUPPER(ch2)); /* old-style */ + else { /* compare "7bit approximation" for letters >127 */ /* BTW, if we remove the check for >127 above */ /* we get even more "relaxed" insensitive match... */ + CONST char *disp_charset = LYCharSet_UC[current_char_set].MIMEname; int charset_in, charset_out, uck1, uck2; char replace_buf1 [10], replace_buf2 [10]; @@ -1671,6 +1665,7 @@ PUBLIC int UPPER8 ARGS2(int,ch1, int,ch2) /* check to be sure we have not lost any strange characters */ /* which are not found in def7_uni.tbl but _equal_ in fact. */ + /* this also applied for "x-transparent" display mode. */ if ((unsigned char)ch1==(unsigned char)ch2) return(0); /* match */ } diff --git a/src/LYStrings.h b/src/LYStrings.h index 350b88f3..bb4d70f2 100644 --- a/src/LYStrings.h +++ b/src/LYStrings.h @@ -3,9 +3,6 @@ #include <string.h> -#if !defined(EXP_8BIT_TOUPPER) && !defined(LOCALE) -#define EXP_8BIT_TOUPPER -#endif /* UPPER8(ch1,ch2) is an extension of (TOUPPER(ch1) - TOUPPER(ch2)) */ extern int UPPER8 PARAMS(( diff --git a/src/LYUtils.c b/src/LYUtils.c index c0d9ebc8..48d76486 100644 --- a/src/LYUtils.c +++ b/src/LYUtils.c @@ -4063,7 +4063,7 @@ have_VMS_URL: #endif /* DOSPATH */ if (*old_string == '~') { /* - * On Unix, covert '~' to Home_Dir(). + * On Unix, convert '~' to Home_Dir(). */ StrAllocCat(*AllocatedString, Home_Dir()); if ((cp = strchr(old_string, '/')) != NULL) { diff --git a/userdefs.h b/userdefs.h index c460fbc3..edf941c2 100644 --- a/userdefs.h +++ b/userdefs.h @@ -230,6 +230,9 @@ #else /* UNIX */ /************************** + * NOTE: This variable is set by the configure scrip; editing changes will + * be ignored. + * * LYNX_CFG_FILE is the location and name of the default lynx * global configuration file. It is sought and processed at * startup of Lynx, followed by a seek and processing of a @@ -322,32 +325,9 @@ #define XLOADIMAGE_COMMAND "xli %s &" /************************** - * For UNIX systems this should be sendmail - * sendmail should be in /usr/lib - * - * You definitely want sendmail, not mail or elm or something else, - * except in the case where MMDF is your mail agent. - * For MMDF you should use submit (SCO) - * - * SYSTEM_MAIL must be defined here. You can change it in lynx.cfg. - * - * SYSTEM_MAIL_FLAGS must be defined here appropriately for your - * SYSTEM_MAIL definition. You can change it in lynx.cfg. + * For UNIX systems, SYSTEM_MAIL and SYSTEM_MAIL_FLAGS are set by the + * configure-script. */ -#ifndef HAVE_CONFIG_H -#ifdef MMDF -#define SYSTEM_MAIL "/usr/mmdf/bin/submit" -#define SYSTEM_MAIL_FLAGS "-mlruxto,cc\\*" -#else -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__) -#define SYSTEM_MAIL "/usr/sbin/sendmail" -#define SYSTEM_MAIL_FLAGS "-t -oi" -#else /* everything else: */ -#define SYSTEM_MAIL "/usr/lib/sendmail" -#define SYSTEM_MAIL_FLAGS "-t -oi" -#endif /* __FreeBSD || __NetBSD__ || __bsdi__ */ -#endif /* MMDF */ -#endif /* !HAVE_CONFIG_H */ /************************** * A place to put temporary files, it's almost always in "/tmp/" @@ -1212,7 +1192,7 @@ * the version definition with the Project Version on checkout. Just * ignore it. - kw */ /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */ -#define LYNX_VERSION "2.8rel.3" +#define LYNX_VERSION "2.8.1dev.2" #ifndef MAXINT #define MAXINT 2147483647 /* max integer */ @@ -1283,56 +1263,7 @@ #define CHMOD_PATH "chmod" #else /* Unix */ - -/* -** Check these paths on Unix! -** ========================== -*/ -#ifndef HAVE_CONFIG_H -#if defined(__FreeBSD__)||defined(__NetBSD__)||defined(__bsdi__)||defined(LINUX) -/* -** FreeBSD, NetBSD, BSDI, or Linux: -** ================================ -*/ -#define COMPRESS_PATH "/usr/bin/compress" -#define UNCOMPRESS_PATH "/usr/bin/gunzip" -#define UUDECODE_PATH "/usr/bin/uudecode" -#define ZCAT_PATH "/usr/bin/zcat" -#define GZIP_PATH "/usr/bin/gzip" -#define INSTALL_PATH "/usr/bin/install" -#define INSTALL_ARGS "-c" -#define TAR_PATH "/usr/bin/tar" -#define TOUCH_PATH "/usr/bin/touch" -#else -/* -** Other Unix: -** =========== -*/ -#define COMPRESS_PATH "/usr/ucb/compress" -#define UNCOMPRESS_PATH "/usr/ucb/uncompress" -#define UUDECODE_PATH "/bin/uudecode" -#define ZCAT_PATH "/usr/local/bin/zcat" -#define GZIP_PATH "/usr/local/bin/gzip" -#define INSTALL_PATH "/bin/install" -#define INSTALL_ARGS "-c" -#define TAR_PATH "/bin/tar" -#define TOUCH_PATH "/bin/touch" - -#endif /* __FreeBSD__ || __NetBSD__ || __bsdi__ || LINUX */ - -/* -** All Unix: -** ========= -*/ -#define ZIP_PATH "/usr/local/bin/zip" -#define UNZIP_PATH "/usr/local/bin/unzip" -#define MKDIR_PATH "/bin/mkdir" -#define MV_PATH "/bin/mv" -#define RM_PATH "/bin/rm" -#define COPY_PATH "/bin/cp" -#define CHMOD_PATH "/bin/chmod" - -#endif /* HAVE_CONFIG_H */ + /* this is done via the configure script */ #endif /* DOSPATH */ #endif /* VMS */ |