diff -Naur w3c-libwww-5.4.1/configure.ac w3c-libwww-5.4.1.oden/configure.ac
--- w3c-libwww-5.4.1/configure.ac	2006-12-03 13:12:52.000000000 -0500
+++ w3c-libwww-5.4.1.oden/configure.ac	2008-07-11 04:15:18.000000000 -0400
@@ -28,7 +28,7 @@
 
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION) 
 
-AM_CONFIG_HEADER(wwwconf.h)
+AC_CONFIG_HEADER(wwwconf.h)
 
 dnl our own functions
 
@@ -586,25 +586,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)
diff -Naur w3c-libwww-5.4.1/Makefile.am w3c-libwww-5.4.1.oden/Makefile.am
--- w3c-libwww-5.4.1/Makefile.am	2003-03-21 08:24:00.000000000 -0500
+++ w3c-libwww-5.4.1.oden/Makefile.am	2008-07-11 04:15:18.000000000 -0400
@@ -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