build: use only one m4/ directory

* Makefile.am (ACLOCAL_AMFLAGS): Specify only one include dir: m4.
* bootstrap: Tell gnulib-tool to put .m4 files in m4/, not gnulib/m4.
* autogen.sh: Move autoreconf from here into...
* bootstrap: ...here, so that it is run only when gnulib-tool is.
Also, tell it to skip the usual autopoint and libtoolize runs.
* m4/.gitignore: Update.

diff --git a/Makefile.am b/Makefile.am
index 8fed9ec..bbf23d9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4
+ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = gnulib/lib src daemon appliance fish po examples images \
        gnulib/tests capitests regressions test-tool

diff --git a/autogen.sh b/autogen.sh
index 649ca7b..9c73a2d 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -32,13 +32,6 @@ else
     ./bootstrap && echo "$t" > $curr_status
 fi
 
-mkdir -p daemon/m4
-
-# Remove this file, so autoreconf doesn't complain about it being
-# locally modified.
-rm -f build-aux/config.rpath
-autoreconf -i
-
 CONFIGUREDIR=.
 
 # Run configure in BUILDDIR if it's set

diff --git a/bootstrap b/bootstrap
index c2d5604..c3f7d6e 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -76,7 +76,11 @@ warnings
 $gnulib_tool                   \
   --avoid=dummy                        \
   --with-tests                 \
-  --m4-base=gnulib/m4          \
+  --m4-base=m4                 \
   --source-base=gnulib/lib     \
   --tests-base=gnulib/tests    \
   --import $modules
+
+# Disable autopoint and libtoolize, since they were already done above.
+AUTOPOINT=true LIBTOOLIZE=true \
+    autoreconf --verbose --install --no-recursive

diff --git a/m4/.gitignore b/m4/.gitignore
index a2d2160..2f903a4 100644 (file)
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -25,3 +25,64 @@ ulonglong.m4
 wchar_t.m4
 wint_t.m4
 xsize.m4
+/00gnulib.m4
+/alloca.m4
+/close-stream.m4
+/closeout.m4
+/eealloc.m4
+/environ.m4
+/errno_h.m4
+/error.m4
+/exitfail.m4
+/extensions.m4
+/float_h.m4
+/fpending.m4
+/getpagesize.m4
+/glibc2.m4
+/gnu-make.m4
+/gnulib-common.m4
+/gnulib-comp.m4
+/gnulib-tool.m4
+/include_next.m4
+/inline.m4
+/intl.m4
+/intldir.m4
+/intlmacosx.m4
+/intmax_t.m4
+/localcharset.m4
+/locale-fr.m4
+/locale-ja.m4
+/locale-zh.m4
+/lock.m4
+/malloca.m4
+/manywarnings.m4
+/mbrtowc.m4
+/mbsinit.m4
+/mbstate_t.m4
+/memchr.m4
+/mmap-anon.m4
+/multiarch.m4
+/onceonly.m4
+/quotearg.m4
+/rawmemchr.m4
+/setenv.m4
+/stdbool.m4
+/stddef_h.m4
+/stdint.m4
+/stdio_h.m4
+/stdlib_h.m4
+/strchrnul.m4
+/strerror.m4
+/string_h.m4
+/strndup.m4
+/strnlen.m4
+/threadlib.m4
+/unistd_h.m4
+/vasnprintf.m4
+/vasprintf.m4
+/visibility.m4
+/warnings.m4
+/wchar.m4
+/wctob.m4
+/wctype.m4
+/xalloc.m4