--- Library/src/wwwsys.html.orig	2006-02-08 16:42:09.000000000 +0100
+++ Library/src/wwwsys.html	2006-02-08 16:42:27.000000000 +0100
@@ -747,7 +747,7 @@
 
 /* stdef.h */
 #ifdef HAVE_STDDEF_H
-#include <stddef.h>
+#include &lt;stddef.h&gt;
 #endif
 
 /* types.h */
--- Makefile.am.orig	2006-02-08 17:42:04.000000000 +0100
+++ Makefile.am	2006-02-08 17:42:33.000000000 +0100
@@ -34,7 +34,7 @@
 install-exec-local:
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(includedir)
-	$(INSTALL_DATA) $(top_builddir)/$(CONFIG_HEADER) $(DESTDIR)$(includedir)/$(CONFIG_HEADER);
+#	$(INSTALL_DATA) $(top_builddir)/$(CONFIG_HEADER) $(DESTDIR)$(includedir)/$(CONFIG_HEADER);
 
 # This is our install script provided by Soren Sandmann
 bin_SCRIPTS = libwww-config
--- configure.ac.orig	2006-02-28 10:12:25.000000000 +0100
+++ configure.ac	2006-02-28 10:14:41.000000000 +0100
@@ -28,7 +28,7 @@
 
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION) 
 
-AM_CONFIG_HEADER(wwwconf.h)
+AC_CONFIG_HEADER(wwwconf.h)
 
 dnl our own functions
 
@@ -555,25 +555,24 @@
     AC_MSG_RESULT(yes)
     AC_DEFINE(HT_EXPAT, 1, [Define to enable expat XML parser.])
     HTXML="HTXML.lo"
-    HTLIBXML='${top_builddir}/modules/expat/libexpat.la'
+    HTLIBXML='-lexpat'
     WWWXML="libwwwxml.la"
     LWWWXML="-lwwwxml -lexpat"
-    LIBWWWXML='${top_builddir}/Library/src/libwwwxml.la ${top_builddir}/modules/expat/libexpat.la'
+    LIBWWWXML='${top_builddir}/Library/src/libwwwxml.la'
     SHOWXML='showxml$(EXEEXT) ptri$(EXEEXT) stri$(EXEEXT) rdf_parse_file$(EXEEXT) rdf_parse_buffer$(EXEEXT)'
     ;;
   esac ],
   AC_MSG_RESULT(yes)
   AC_DEFINE(HT_EXPAT)
   HTXML="HTXML.lo"
-  HTLIBXML='${top_builddir}/modules/expat/libexpat.la'
+  HTLIBXML='-lexpat'
   WWWXML="libwwwxml.la"
   LWWWXML="-lwwwxml -lexpat"
-  LIBWWWXML='${top_builddir}/Library/src/libwwwxml.la ${top_builddir}/modules/expat/libexpat.la'
+  LIBWWWXML='${top_builddir}/Library/src/libwwwxml.la'
   SHOWXML='showxml$(EXEEXT) ptri$(EXEEXT) stri$(EXEEXT) rdf_parse_file$(EXEEXT) rdf_parse_buffer$(EXEEXT)'
 )
 
 dnl @@ JK: add something like (if test, then do this config)
-AC_CONFIG_SUBDIRS(modules/expat)
 AC_SUBST(HTXML)		# for old style big library
 AC_SUBST(HTLIBXML)	# for old style big library
 AC_SUBST(WWWXML)