Files that are used by the autoconf build system belong in

the build/autoconf dir.  We may need to further split that
out to separate the files that get generated by autoconf/automake/etc
from the files that are provided by libarchive.

SVN-Revision: 828

diff --git a/Makefile.am b/Makefile.am
index 4709dc1255172e28c80b447e4fb2cdcfa1249bf8..51621e2e3de44ee7cd2b22bb05d932c51023ec1c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 AUTOMAKE_OPTIONS= foreign subdir-objects
-ACLOCAL_AMFLAGS = -I build/m4
+ACLOCAL_AMFLAGS = -I build/autoconf
 
 #
 # What to build and install

diff --git a/build/m4/la_syslibsearchpath.m4 b/build/autoconf/la_syslibsearchpath.m4
similarity index 100%
rename from build/m4/la_syslibsearchpath.m4
rename to build/autoconf/la_syslibsearchpath.m4

diff --git a/configure.ac b/configure.ac
index 8669445a0cf29adcdfc53ee83b1edc2009a52f67..d1aed406cec4fe690dfbaef7633c2b509e98477e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ AC_CONFIG_SRCDIR([libarchive])
 # Use auxiliary subscripts from this subdirectory (cleans up root)
 AC_CONFIG_AUX_DIR([build/autoconf])
 # M4 scripts
-AC_CONFIG_MACRO_DIR([build/m4])
+AC_CONFIG_MACRO_DIR([build/autoconf])
 # Must follow AC_CONFIG macros above...
 AM_INIT_AUTOMAKE()