--- httpd-2.2.17/srclib/apr-util/xml/apr_xml.c.org	2009-06-03 16:56:02.000000000 +0200
+++ httpd-2.2.17/srclib/apr-util/xml/apr_xml.c	2011-02-02 07:26:37.915553300 +0100
@@ -26,15 +26,17 @@
 #include "apu_config.h"
 
 #if defined(HAVE_XMLPARSE_XMLPARSE_H)
-#include <xmlparse/xmlparse.h>
+#include "xmlparse/xmlparse.h"
 #elif defined(HAVE_XMLTOK_XMLPARSE_H)
-#include <xmltok/xmlparse.h>
+#include "xmltok/xmlparse.h"
 #elif defined(HAVE_XML_XMLPARSE_H)
-#include <xml/xmlparse.h>
+#include "xml/xmlparse.h"
 #else
-#include <expat.h>
+#include "expat.h"
 #endif
 
+#undef  XML_MAJOR_VERSION
+#define XML_MAJOR_VERSION 1
 #define DEBUG_CR "\r\n"
 
 static const char APR_KW_xmlns[] = { 0x78, 0x6D, 0x6C, 0x6E, 0x73, '\0' };
--- httpd-2.2.17/srclib/apr-util/build/apu-conf.m4.org	2010-09-29 16:00:14.000000000 +0200
+++ httpd-2.2.17/srclib/apr-util/build/apu-conf.m4	2011-02-02 09:25:23.542094202 +0100
@@ -165,6 +165,7 @@
   bundled_subdir="xml/expat"
   APR_SUBDIR_CONFIG($bundled_subdir, [--prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir])
   APR_ADDTO(APRUTIL_INCLUDES, [-I$top_builddir/$bundled_subdir/lib])
+  APR_ADDTO(APRUTIL_INCLUDES, [-I$abs_srcdir/$bundled_subdir/lib])
   APR_ADDTO(LDFLAGS, [-L$top_builddir/$bundled_subdir/lib])
   apu_expat_libs="$top_builddir/$bundled_subdir/libexpat.la"
 fi
--- httpd-2.2.17/srclib/apr-util/xml/expat/Makefile.in.org	2010-09-29 16:00:14.000000000 +0200
+++ httpd-2.2.17/srclib/apr-util/xml/expat/Makefile.in	2011-02-02 10:32:07.721639103 +0100
@@ -85,9 +85,9 @@
 install: installlib
 
 installlib: $(LIBRARY) $(APIHEADER)
-	$(mkinstalldirs) $(libdir) $(includedir)
-	$(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(libdir)/$(LIBRARY)
-	$(INSTALL_DATA) $(APIHEADER) $(includedir)
+	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
+	$(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY)
+	$(INSTALL_DATA) $(APIHEADER) $(DESTDIR)$(includedir)
 
 $(LIBRARY): $(LIB_OBJS)
 	$(LINK_LIB) $(LIB_OBJS)
