[Mod-security-developers] [PATCH] build: use build/ directory for all the m4 macros, including libtool's.

[Diego E. P. <fla...@gm...>]

This allows using "autoreconf -fis" as the only autogen step.
---
 Makefile.am  |    2 +-
 configure.ac |   11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a78c322..407a537 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-ACLOCAL_AMFLAGS = -I acinclude
+ACLOCAL_AMFLAGS = -I build
 SUBDIRS = @TOPLEVEL_SUBDIRS@ tests
 
 # Alias for "check"
diff --git a/configure.ac b/configure.ac
index c4b8836..7015de5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ AC_PREREQ(2.63)
 
 AC_INIT([modsecurity], [2.6], [su...@mo...])
 
-AC_CONFIG_MACRO_DIR([acinclude])
+AC_CONFIG_MACRO_DIR([build])
 AC_CONFIG_SRCDIR([LICENSE])
 AC_CONFIG_HEADERS([modsecurity_config_auto.h])
 AC_CONFIG_AUX_DIR([build])
@@ -514,15 +514,6 @@ else
   fi
 fi
 
-# Include M4 macros
-sinclude(build/find_pcre.m4)
-sinclude(build/find_apr.m4)
-sinclude(build/find_apu.m4)
-sinclude(build/find_xml.m4)
-sinclude(build/find_lua.m4)
-sinclude(build/find_curl.m4)
-
-
 ### Build *EXTRA_CFLAGS vars
 
 # Allow overriding EXTRA_CFLAGS
-- 
1.7.5.rc1