--- parser3/src/classes/Makefile.in	2001/10/02 11:13:35	1.19
+++ parser3/src/classes/Makefile.in	2001/10/27 12:17:17	1.28
@@ -59,7 +59,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-APACHE13_SRC = @APACHE13_SRC@
+APACHE13 = @APACHE13@
+APACHE_LIBS = @APACHE_LIBS@
 AS = @AS@
 AWK = @AWK@
 CC = @CC@
@@ -73,6 +74,7 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 OBJDUMP = @OBJDUMP@
+P3S = @P3S@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -80,13 +82,17 @@ XML_INCLUDES = @XML_INCLUDES@
 XML_LIBS = @XML_LIBS@
 YACC = @YACC@
 host_os = @host_os@
+@COMPILE_XML_TRUE@PATCHES_SUBDIR = xalan-patched
+@COMPILE_XML_FALSE@PATCHES_SUBDIR = 
+@COMPILE_XML_TRUE@PATCHES_INCLUDES = -I$(PATCHES_SUBDIR)
+@COMPILE_XML_FALSE@PATCHES_INCLUDES = 
 
-SUBDIRS = gd
+SUBDIRS = gd $(PATCHES_SUBDIR)
 
-INCLUDES = -I../types -I../sql -I../pcre -Igd @XML_INCLUDES@
+INCLUDES = -I../types -I../sql -I../pcre -Igd $(PATCHES_INCLUDES) @XML_INCLUDES@
 
 noinst_LIBRARIES = libclasses.a
-libclasses_a_SOURCES = classes.C double.C file.C form.C image.C int.C mail.C op.C math.C response.C string.C table.C void.C hash.C date.C xnode.C xdoc.C ident.C
+libclasses_a_SOURCES = ident.C classes.C double.C file.C form.C image.C int.C mail.C op.C math.C response.C string.C table.C void.C hash.C date.C xnode.C xdoc.C hashfile.C
 CLEANFILES = classes.inc
 
 CLASSES_INC_DEPS = *.C
@@ -104,9 +110,9 @@ CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 libclasses_a_LIBADD = 
-libclasses_a_OBJECTS =  classes.o double.o file.o form.o image.o int.o \
-mail.o op.o math.o response.o string.o table.o void.o hash.o date.o \
-xnode.o xdoc.o ident.o
+libclasses_a_OBJECTS =  ident.o classes.o double.o file.o form.o image.o \
+int.o mail.o op.o math.o response.o string.o table.o void.o hash.o \
+date.o xnode.o xdoc.o hashfile.o
 AR = ar
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -118,12 +124,13 @@ DIST_COMMON =  Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
+DIST_SUBDIRS =  gd xalan-patched
 DEP_FILES =  .deps/classes.P .deps/date.P .deps/double.P .deps/file.P \
-.deps/form.P .deps/hash.P .deps/ident.P .deps/image.P .deps/int.P \
-.deps/mail.P .deps/math.P .deps/op.P .deps/response.P .deps/string.P \
-.deps/table.P .deps/void.P .deps/xdoc.P .deps/xnode.P
+.deps/form.P .deps/hash.P .deps/hashfile.P .deps/ident.P .deps/image.P \
+.deps/int.P .deps/mail.P .deps/math.P .deps/op.P .deps/response.P \
+.deps/string.P .deps/table.P .deps/void.P .deps/xdoc.P .deps/xnode.P
 SOURCES = $(libclasses_a_SOURCES)
 OBJECTS = $(libclasses_a_OBJECTS)
 
@@ -290,14 +297,14 @@ distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
-	for subdir in $(SUBDIRS); do \
+	for subdir in $(DIST_SUBDIRS); do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d $(distdir)/$$subdir \
 	    || mkdir $(distdir)/$$subdir \