build: do not call boilerplate ourself

Rationale see section 3.5 "Using `autoreconf' to Update `configure'
Scripts" of the autoconf manual.

http://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autoreconf-Invocation.html

Signed-off-by: Jan Engelhardt <jengelh@inai.de>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>

diff --git a/Makefile.am b/Makefile.am
index 18ad36d2ba21f8eef1946f5cf541c984f4d78b9a..9c299a9efe23c2894348bfd771b56fe9dbc00090 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,6 @@
+
+ACLOCAL_AMFLAGS = -I config
+
 include $(top_srcdir)/config/rpm.am
 include $(top_srcdir)/config/deb.am
 include $(top_srcdir)/config/tgz.am

diff --git a/autogen.sh b/autogen.sh
index 343265c8300818fb54baeccfd999ae8fd93ea593..427394af47a3b919d8fa3afce741dfdce983404c 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,4 @@
 #!/bin/sh
 
-aclocal -I config
-libtoolize --automake --copy
-autoheader
-automake --add-missing --include-deps --copy
-autoconf
+autoreconf -fiv
+rm -Rf autom4te.cache

diff --git a/config/.gitignore b/config/.gitignore
index dcd88d7c6aba663e15c9910e7a1bffb50a1b72ba..12e6ecab10d073b2cd35d498f9ad0eb07fd7ed0e 100644 (file)
--- a/config/.gitignore
+++ b/config/.gitignore
@@ -4,3 +4,5 @@
 /install-sh
 /ltmain.sh
 /missing
+/libtool.m4
+/lt*.m4

diff --git a/configure.ac b/configure.ac
index 413114bac2e95c3e1fb616bea2ad422f8d58bf5c..a058a1fff4a41a5f93e3b0bfaeba16e6129b4df6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,7 @@ AC_INIT
 AC_LANG(C)
 ZFS_AC_META
 AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_MACRO_DIR([config])
 AC_CANONICAL_SYSTEM
 AM_MAINTAINER_MODE
 AM_SILENT_RULES