Index: configure.in
===================================================================
--- configure.in	(revision 14013)
+++ configure.in	(working copy)
@@ -20,6 +20,7 @@
 
 AC_CONFIG_SRCDIR(subversion/include/svn_types.h)
 AC_CONFIG_AUX_DIR(ac-helpers)
+AC_CONFIG_MACRO_DIR(build/ac-macros)
 
 AC_MSG_NOTICE([Configuring Subversion ]AC_PACKAGE_VERSION)
 
Index: build/ac-macros/aprutil.m4
===================================================================
--- build/ac-macros/aprutil.m4	(revision 14013)
+++ build/ac-macros/aprutil.m4	(working copy)
@@ -13,7 +13,7 @@
 dnl
 
 
-AC_DEFUN(SVN_LIB_APRUTIL,
+AC_DEFUN([SVN_LIB_APRUTIL],
 [
   APRUTIL_WANTED_REGEX="$1"
   APRUTIL_WANTED_REGEX_TOO="$2"
@@ -87,7 +87,7 @@
 
 dnl SVN_DOWNLOAD_APRUTIL()
 dnl no apr-util found, print out a message telling the user what to do
-AC_DEFUN(SVN_DOWNLOAD_APRUTIL,
+AC_DEFUN([SVN_DOWNLOAD_APRUTIL],
 [
   echo "The Apache Portable Runtime Utility (APRUTIL) library cannot be found."
   echo "Either install APRUTIL on this system and supply the appropriate"
Index: build/ac-macros/java.m4
===================================================================
--- build/ac-macros/java.m4	(revision 14013)
+++ build/ac-macros/java.m4	(working copy)
@@ -2,7 +2,7 @@
 dnl java.m4: Locates the JDK and its include files and libraries.
 dnl
 
-AC_DEFUN(SVN_CHECK_JDK,
+AC_DEFUN([SVN_CHECK_JDK],
 [
   AC_ARG_WITH(jdk,
               AC_HELP_STRING([--with-jdk=PATH],
@@ -27,7 +27,7 @@
   ])
 ])
 
-AC_DEFUN(SVN_FIND_JDK,
+AC_DEFUN([SVN_FIND_JDK],
 [
   where=$1
 
Index: build/ac-macros/apr.m4
===================================================================
--- build/ac-macros/apr.m4	(revision 14013)
+++ build/ac-macros/apr.m4	(working copy)
@@ -8,7 +8,7 @@
 dnl  the Apache Portable Runtime (APR) library.
 dnl
 
-AC_DEFUN(SVN_LIB_APR,
+AC_DEFUN([SVN_LIB_APR],
 [
   APR_WANTED_REGEX="$1"
   APR_WANTED_REGEX_TOO="$2"
@@ -95,7 +95,7 @@
 
 dnl SVN_DOWNLOAD_APR()
 dnl no apr found, print out a message telling the user what to do
-AC_DEFUN(SVN_DOWNLOAD_APR,
+AC_DEFUN([SVN_DOWNLOAD_APR],
 [
   echo "The Apache Portable Runtime (APR) library cannot be found."
   echo "Please install APR on this system and supply the appropriate"
Index: build/ac-macros/berkeley-db.m4
===================================================================
--- build/ac-macros/berkeley-db.m4	(revision 14013)
+++ build/ac-macros/berkeley-db.m4	(working copy)
@@ -14,7 +14,7 @@
 dnl   search is skipped.
 
 
-AC_DEFUN(SVN_LIB_BERKELEY_DB,
+AC_DEFUN([SVN_LIB_BERKELEY_DB],
 [
   db_version=$1.$2.$3
   dnl  Process the `with-berkeley-db' switch.  We set `status' to one
@@ -157,7 +157,7 @@
 dnl in the db.h header with the ones returned by db_version().
 
 
-AC_DEFUN(SVN_LIB_BERKELEY_DB_TRY,
+AC_DEFUN([SVN_LIB_BERKELEY_DB_TRY],
   [
     svn_lib_berkeley_db_try_save_cppflags="$CPPFLAGS"
     svn_lib_berkeley_db_try_save_libs="$LIBS"
Index: build/ac-macros/svn-apache.m4
===================================================================
--- build/ac-macros/svn-apache.m4	(revision 14013)
+++ build/ac-macros/svn-apache.m4	(working copy)
@@ -8,7 +8,7 @@
 dnl       source dir, we cannot create static builds of the system.
 dnl
 
-AC_DEFUN(SVN_FIND_APACHE,[
+AC_DEFUN([SVN_FIND_APACHE],[
 
 HTTPD_WANTED_MMN="$1"
 
Index: build/ac-macros/svn-macros.m4
===================================================================
--- build/ac-macros/svn-macros.m4	(revision 14013)
+++ build/ac-macros/svn-macros.m4	(working copy)
@@ -7,7 +7,7 @@
 dnl of the arguments. this is different from config.status which simply
 dnl regenerates the output files. config.nice is useful after you rebuild
 dnl ./configure (via autoconf or autogen.sh)
-AC_DEFUN(SVN_CONFIG_NICE,[
+AC_DEFUN([SVN_CONFIG_NICE],[
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_MSG_NOTICE([creating $1])
   rm -f $1
@@ -47,7 +47,7 @@
 dnl
 dnl Note that this code is a direct copy of that which is found in 
 dnl the apr project's build/apr_common.m4.
-AC_DEFUN(SVN_SUBDIR_CONFIG, [
+AC_DEFUN([SVN_SUBDIR_CONFIG], [
   if test "$do_subdir_config" = "yes" ; then
     # save our work to this point; this allows the sub-package to use it
     AC_CACHE_SAVE
@@ -91,7 +91,7 @@
 dnl
 dnl Make AC_OUTPUT create an executable file.
 dnl
-AC_DEFUN(SVN_CONFIG_SCRIPT, [
+AC_DEFUN([SVN_CONFIG_SCRIPT], [
   AC_CONFIG_FILES([$1], [chmod +x $1])])
 
 dnl Iteratively interpolate the contents of the second argument
@@ -108,7 +108,7 @@
 dnl SVN_EXPAND_VAR(fraz, $baz)
 dnl   $fraz is now "1/2/3"
 dnl 
-AC_DEFUN(SVN_EXPAND_VAR,[
+AC_DEFUN([SVN_EXPAND_VAR],[
 svn_last=
 svn_cur="$2"
 while test "x${svn_cur}" != "x${svn_last}";
@@ -130,7 +130,7 @@
 dnl headers, as system headers on some platforms may fail strictness checks
 dnl we wish to use on other platforms.
 
-AC_DEFUN(SVN_MAYBE_ADD_TO_CFLAGS,
+AC_DEFUN([SVN_MAYBE_ADD_TO_CFLAGS],
 [
   option="$1"
   svn_maybe_add_to_cflags_saved_flags="$CFLAGS"
Index: build/ac-macros/swig.m4
===================================================================
--- build/ac-macros/swig.m4	(revision 14013)
+++ build/ac-macros/swig.m4	(working copy)
@@ -5,7 +5,7 @@
 dnl if we do, then set up the appropriate SWIG_ variables to build the 
 dnl python bindings.
 
-AC_DEFUN(SVN_CHECK_SWIG,
+AC_DEFUN([SVN_CHECK_SWIG],
 [
   AC_ARG_WITH(swig,
               AC_HELP_STRING([--with-swig=PATH],
@@ -30,7 +30,7 @@
   ])
 ])
 
-AC_DEFUN(SVN_FIND_SWIG,
+AC_DEFUN([SVN_FIND_SWIG],
 [
   where=$1
 
Index: build/ac-macros/neon.m4
===================================================================
--- build/ac-macros/neon.m4	(revision 14013)
+++ build/ac-macros/neon.m4	(working copy)
@@ -20,7 +20,7 @@
 dnl   If the search for neon fails, set svn_lib_neon to no, otherwise set 
 dnl   it to yes.
 
-AC_DEFUN(SVN_LIB_NEON,
+AC_DEFUN([SVN_LIB_NEON],
 [
   NEON_WANTED_REGEX="$1"
   NEON_LATEST_WORKING_VER="$2"
@@ -117,7 +117,7 @@
 
 dnl SVN_NEON_CONFIG()
 dnl neon-config found, gather relevant information from it
-AC_DEFUN(SVN_NEON_CONFIG,
+AC_DEFUN([SVN_NEON_CONFIG],
 [
   if test -f "$neon_config"; then
     if test "$neon_config" != ""; then
@@ -152,7 +152,7 @@
 
 dnl SVN_DOWNLOAD_NEON()
 dnl no neon found, print out a message telling the user what to do
-AC_DEFUN(SVN_DOWNLOAD_NEON,
+AC_DEFUN([SVN_DOWNLOAD_NEON],
 [
   echo ""
   echo "An appropriate version of neon could not be found, so libsvn_ra_dav"
Index: autogen.sh
===================================================================
--- autogen.sh	(revision 14013)
+++ autogen.sh	(working copy)
@@ -48,19 +48,20 @@
     exit 1
 fi
 
-$libtoolize --copy --automake
+$libtoolize --copy --install
+aclocal -I ac-helpers -I build/ac-macros
 
-ltpath="`dirname $libtoolize`"
-ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
+#ltpath="`dirname $libtoolize`"
+#ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
+#
+#if [ ! -f $ltfile ]; then
+#    echo "$ltfile not found (try setting the LIBTOOL_M4 environment variable)"
+#    exit 1
+#fi
 
-if [ ! -f $ltfile ]; then
-    echo "$ltfile not found (try setting the LIBTOOL_M4 environment variable)"
-    exit 1
-fi
+#echo "Copying libtool helper: $ltfile"
+#cp $ltfile ac-helpers/libtool.m4
 
-echo "Copying libtool helper: $ltfile"
-cp $ltfile ac-helpers/libtool.m4
-
 # Create the file detailing all of the build outputs for SVN.
 #
 # Note: this dependency on Python is fine: only SVN developers use autogen.sh
Index: aclocal.m4
===================================================================
--- aclocal.m4	(revision 14013)
+++ aclocal.m4	(working copy)
@@ -1,23 +1,27 @@
-# aclocal.m4: Supplementary macros used by Subversion's configure.in
-#
-# These are here rather than directly in configure.in, since this prevents
-# comments in the macro files being copied into configure.in, producing
-# useless bloat. (This is significant - a 12kB reduction in size!)
 
-# Include macros distributed by the APR project
-sinclude(build/ac-macros/find_apr.m4)
-sinclude(build/ac-macros/find_apu.m4)
 
-# Include Subversion's own custom macros
-sinclude(build/ac-macros/svn-macros.m4)
-sinclude(build/ac-macros/apr.m4)
-sinclude(build/ac-macros/aprutil.m4)
-sinclude(build/ac-macros/neon.m4)
-sinclude(build/ac-macros/berkeley-db.m4)
-sinclude(build/ac-macros/svn-apache.m4)
-sinclude(build/ac-macros/java.m4)
-sinclude(build/ac-macros/swig.m4)
 
-# Include the libtool macros
-sinclude(ac-helpers/libtool.m4)
-