--- acinclude.m4.orig	2004-09-10 09:40:25.000000000 +0200
+++ acinclude.m4	2004-09-10 09:40:52.000000000 +0200
@@ -741,7 +741,7 @@
 
 # This macro is used internally to discover the suffix for the current
 # settings of $module.  The result is stored in $_SOSUFFIX.
-AC_DEFUN(_SOSUFFIX_INTERNAL, [
+AC_DEFUN([_SOSUFFIX_INTERNAL], [
 	versuffix=""
 	release=""
 	libname=libfoo
@@ -760,7 +760,7 @@
 
 # SOSUFFIX_CONFIG will set the variable SOSUFFIX to be the
 # shared library extension used for general linking, not dlopen.
-AC_DEFUN(SOSUFFIX_CONFIG, [
+AC_DEFUN([SOSUFFIX_CONFIG], [
 	AC_MSG_CHECKING([SOSUFFIX from libtool])
 	module=no
         _SOSUFFIX_INTERNAL
@@ -772,7 +772,7 @@
 # MODSUFFIX_CONFIG will set the variable MODSUFFIX to be the
 # shared library extension used for dlopen'ed modules.
 # To discover this, we set $module, simulating libtool's -module option.
-AC_DEFUN(MODSUFFIX_CONFIG, [
+AC_DEFUN([MODSUFFIX_CONFIG], [
 	AC_MSG_CHECKING([MODSUFFIX from libtool])
 	module=yes
         _SOSUFFIX_INTERNAL
@@ -788,7 +788,7 @@
 # Robert Boehne:  Not much point in this macro any more because apparently
 # Darwin is the only OS that wants or needs the .jnilib extension.
 ##########################################################################
-AC_DEFUN(JMODSUFFIX_CONFIG, [
+AC_DEFUN([JMODSUFFIX_CONFIG], [
 	AC_MSG_CHECKING([JMODSUFFIX from libtool])
 	module=yes
         _SOSUFFIX_INTERNAL
--- configure.ac.orig	2004-09-10 09:37:25.000000000 +0200
+++ configure.ac	2004-09-10 09:39:35.000000000 +0200
@@ -22,11 +22,11 @@
 # 02111-1307 USA. 
 #
 
-AC_INIT(source/javax/xml/parsers/SAXParserFactory.java)
-AC_CONFIG_SRCDIR(xmlj_util.c)
-AC_CONFIG_AUX_DIR(config)
+AC_INIT([jaxp], [1.1], , [jaxp])
+AC_CONFIG_SRCDIR([xmlj_util.c])
+AC_CONFIG_AUX_DIR([config])
 
-AM_INIT_AUTOMAKE(jaxp, 1.1)
+AM_INIT_AUTOMAKE([1.8.0])
 
 AC_JAVA_OPTIONS
 
@@ -71,6 +71,6 @@
 MODSUFFIX_CONFIG
 JMODSUFFIX_CONFIG
 
-AC_CONFIG_FILES(Makefile)
+AC_CONFIG_FILES([Makefile])
 
 AC_OUTPUT
--- Makefile.am.orig	2004-09-10 09:54:52.000000000 +0200
+++ Makefile.am	2004-09-10 09:55:17.000000000 +0200
@@ -499,8 +499,8 @@
 	cp $(srcdir)/testdocs/* $(distdir)/testdocs
 
 install-data-local:
-	@srcdir@/mkinstalldirs $(libdir)
-	$(LT_INSTALL) ${libjso_target} $(libdir)
-	@srcdir@/mkinstalldirs $(datadir)/java/
-	$(INSTALL_DATA) ${libj_jarfile} $(datadir)/java/
+	@srcdir@/mkinstalldirs $(DESTDIR)$(libdir)
+	$(LT_INSTALL) ${libjso_target} $(DESTDIR)$(libdir)
+	@srcdir@/mkinstalldirs $(DESTDIR)$(datadir)/java/
+	$(INSTALL_DATA) ${libj_jarfile} $(DESTDIR)$(datadir)/java/