svn commit: r13156 - trunk

Author: maxb
Date: Fri Feb 25 13:55:19 2005
New Revision: 13156

Added:
   trunk/aclocal.m4
Modified:
   trunk/configure.in
Log:
Buildsystem: Move the supplementary macro includes into a new aclocal.m4 file.
This removes 12kB of bloat from the generated configure script!

* configure.in: Remove sincludes of supplementary macros.
* aclocal.m4: New file - do those sincludes here instead.


Added: trunk/aclocal.m4
Url: http://svn.collab.net/viewcvs/svn/trunk/aclocal.m4?view=auto&rev=13156
==============================================================================
--- (empty file)
+++ trunk/aclocal.m4    Fri Feb 25 13:55:19 2005
@@ -0,0 +1,23 @@
+# 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)
+

Modified: trunk/configure.in
Url: 
http://svn.collab.net/viewcvs/svn/trunk/configure.in?view=diff&rev=13156&p1=trunk/configure.in&r1=13155&p2=trunk/configure.in&r2=13156
==============================================================================
--- trunk/configure.in  (original)
+++ trunk/configure.in  Fri Feb 25 13:55:19 2005
@@ -36,22 +36,6 @@
 MKDIR="$INSTALL -d"
 AC_SUBST(MKDIR)
 
-dnl Grab our own macros
-sinclude(build/ac-macros/berkeley-db.m4)
-sinclude(build/ac-macros/svn-apache.m4)
-sinclude(build/ac-macros/svn-macros.m4)
-sinclude(build/ac-macros/neon.m4)
-sinclude(build/ac-macros/find_apr.m4)
-sinclude(build/ac-macros/apr.m4)
-sinclude(build/ac-macros/find_apu.m4)
-sinclude(build/ac-macros/aprutil.m4)
-sinclude(build/ac-macros/java.m4)
-sinclude(build/ac-macros/swig.m4)
-
-
-dnl Grab the libtool macros
-sinclude(ac-helpers/libtool.m4)
-
 
 dnl Generate config.nice early (before the args are munged)
 SVN_CONFIG_NICE(config.nice)