--- parser3/src/classes/Makefile.in	2001/10/24 16:59:37	1.27
+++ parser3/src/classes/Makefile.in	2001/10/28 14:07:45	1.30
@@ -60,11 +60,13 @@ POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 APACHE13 = @APACHE13@
+APACHE_LIBS = @APACHE_LIBS@
 AS = @AS@
 AWK = @AWK@
 CC = @CC@
-CPP_LIBS = @CPP_LIBS@
 CXX = @CXX@
+DB2_INCLUDES = @DB2_INCLUDES@
+DB2_LIBS = @DB2_LIBS@
 DLLTOOL = @DLLTOOL@
 INCLTDL = @INCLTDL@
 LIBADD_DL = @LIBADD_DL@
@@ -73,7 +75,6 @@ LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
-MATH_LIBS = @MATH_LIBS@
 OBJDUMP = @OBJDUMP@
 P3S = @P3S@
 PACKAGE = @PACKAGE@
@@ -83,14 +84,10 @@ 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 $(PATCHES_SUBDIR)
+SUBDIRS = gd xalan-patched
 
-INCLUDES = -I../types -I../sql -I../pcre -Igd $(PATCHES_INCLUDES) @XML_INCLUDES@
+INCLUDES = -I../types -I../sql -I../pcre -Igd -Ixalan-patched @XML_INCLUDES@ @DB2_INCLUDES@
 
 noinst_LIBRARIES = libclasses.a
 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
@@ -127,7 +124,6 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(
 
 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/hashfile.P .deps/ident.P .deps/image.P \
 .deps/int.P .deps/mail.P .deps/math.P .deps/op.P .deps/response.P \
@@ -305,7 +301,7 @@ distdir: $(DISTFILES)
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
-	for subdir in $(DIST_SUBDIRS); do \
+	for subdir in $(SUBDIRS); do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d $(distdir)/$$subdir \
 	    || mkdir $(distdir)/$$subdir \