@@ -0,0 +1,117 @@
+--- w3c-libwww-5.4.0/modules/expat/xmltok/Makefile.am.sopwith 2003-09-03 12:48:03.000000000 -0400
++++ w3c-libwww-5.4.0/modules/expat/xmltok/Makefile.am 2003-09-03 12:50:56.000000000 -0400
+@@ -1,8 +1,8 @@
+ ## Process this file with Automake to create Makefile.in.
+
+-LDFLAGS = -version-info "1:0:1"
++AM_LDFLAGS = -version-info "1:0:1"
+
+-CFLAGS = @CFLAGS@ -DXML_NS
++AM_CFLAGS = @CFLAGS@ -DXML_NS
+
+ lib_LTLIBRARIES = \
+ @XMLTOK@
+--- w3c-libwww-5.4.0/modules/expat/xmlparse/Makefile.am.sopwith 2003-09-03 12:47:55.000000000 -0400
++++ w3c-libwww-5.4.0/modules/expat/xmlparse/Makefile.am 2003-09-03 12:50:38.000000000 -0400
+@@ -1,8 +1,8 @@
+ ## Process this file with Automake to create Makefile.in.
+
+-LDFLAGS = -version-info "1:0:1"
++AM_LDFLAGS = -version-info "1:0:1"
+
+-CFLAGS = @CFLAGS@ -DXML_NS
++AM_CFLAGS = @CFLAGS@ -DXML_NS
+
+ lib_LTLIBRARIES = \
+ @XMLPARSE@
+--- w3c-libwww-5.4.0/Library/src/SSL/Makefile.am.sopwith 2003-09-03 12:49:33.000000000 -0400
++++ w3c-libwww-5.4.0/Library/src/SSL/Makefile.am 2003-09-03 12:49:43.000000000 -0400
+@@ -1,6 +1,6 @@
+ ## Process this file with Automake to create Makefile.in.
+
+-LDFLAGS = -version-info "1:0:1"
++AM_LDFLAGS = -version-info "1:0:1"
+
+ lib_LTLIBRARIES = @WWWSSL@
+
+--- w3c-libwww-5.4.0/Library/src/Makefile.am.sopwith 2003-09-03 12:27:24.000000000 -0400
++++ w3c-libwww-5.4.0/Library/src/Makefile.am 2003-09-03 12:49:09.000000000 -0400
+@@ -1,6 +1,6 @@
+ ## Process this file with Automake to create Makefile.in.
+
+-LDFLAGS = -version-info "1:0:1"
++AM_LDFLAGS = -version-info "1:0:1"
+
+ lib_LTLIBRARIES = \
+ libwwwutils.la \
+@@ -50,7 +50,7 @@
+ endif
+
+ icondir = @icondir@
+-CPPFLAGS := $(CPPFLAGS) -DW3C_ICONS=\"$(icondir)\"
++am_CPPFLAGS = $(CPPFLAGS) -DW3C_ICONS=\"$(icondir)\"
+
+ inc: $(BUILT_SOURCES)
+ @echo Generated built sources
+--- w3c-libwww-5.4.0/Makefile.am.sopwith 2003-09-03 12:27:44.000000000 -0400
++++ w3c-libwww-5.4.0/Makefile.am 2003-09-03 12:28:15.000000000 -0400
+@@ -42,7 +42,6 @@
+ chmod -R a+r $(distdir)
+ zip -rq $(distdir).zip $(distdir)
+ $(TAR) chofz $(distdir).tgz $(distdir)
+- # gzip -f $(distdir).tar
+
+ # Tag before making distribution. Also, don't make a distribution if
+ # checks fail.
+--- w3c-libwww-5.4.0/acinclude.m4.sopwith 2003-09-03 12:46:31.000000000 -0400
++++ w3c-libwww-5.4.0/acinclude.m4 2003-09-03 12:52:13.000000000 -0400
+@@ -1,3 +1,5 @@
++AC_DEFINE([_POSIX_SOURCE], [], [Description])
++
+ AC_DEFUN(AC_SYS_AFS_SYSNAME, [
+ AC_CHECK_PROG(ac_afsws_fs_found, fs, yes)
+ AC_MSG_CHECKING(AFS system name)
+@@ -251,19 +253,6 @@
+ done
+ ])
+
+-dnl AC_C_VOLATILE
+-AC_DEFUN(AC_C_VOLATILE,
+-[ AC_MSG_CHECKING([for working volatile])
+- AC_CACHE_VAL(ac_cv_c_volatile,
+- [ AC_TRY_COMPILE(,[
+-extern volatile int errno;
+-], ac_cv_c_volatile=yes, ac_cv_c_volatile=no)])dnl
+- AC_MSG_RESULT($ac_cv_c_volatile)
+-if test $ac_cv_c_volatile = no; then
+- AC_DEFINE(volatile, )
+-fi
+-])
+-
+ dnl AC_C_NOSHARE
+ AC_DEFUN(AC_C_NOSHARE,
+ [ AC_MSG_CHECKING([for working noshare])
+@@ -403,23 +392,6 @@
+ fi
+ ])
+
+-dnl AC_HEADER_TIOCGWINSZ
+-AC_DEFUN(AC_HEADER_TIOCGWINSZ,
+-[ AC_MSG_CHECKING([for TIOCGWINSZ get-window-size capability])
+- AC_CACHE_VAL(ac_cv_header_tiocgwinsz,
+- [ AC_HEADER_INCLUDE(tmp_inc_termios, sys/termios.h termios.h)
+- AC_EGREP_HEADER(yes, [
+-$tmp_inc_termios
+-#ifdef TIOCGWINSZ
+- yes
+-#endif
+-], ac_cv_header_tiocgwinsz=yes, ac_cv_header_tiocgwinsz=no)])dnl
+- AC_MSG_RESULT($ac_cv_header_tiocgwinsz)
+-if test $ac_cv_header_tiocgwinsz = yes; then
+- AC_DEFINE(GET_SCREEN_SIZE)
+-fi
+-])
+-
+ dnl AC_SYS_NEED_SIGNAL_RESET
+ dnl If signal handlers need to be reset, define NEED_SIGNAL_RESET
+ AC_DEFUN(AC_SYS_NEED_SIGNAL_RESET,
|