diff options
| author | Jan Engelhardt <[email protected]> | 2013-03-30 03:33:09 +0100 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2013-04-02 10:55:20 -0700 |
| commit | 8c3926294579f64f6ebe09b0ddaed5dd9cbd48ef (patch) | |
| tree | 9a8486ee49c40dc8d0c44c36015748a9fda24872 | |
| parent | ea0fcfc8752f96ad518793f946b84394a679640c (diff) | |
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 <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rwxr-xr-x | autogen.sh | 7 | ||||
| -rw-r--r-- | config/.gitignore | 2 | ||||
| -rw-r--r-- | configure.ac | 1 |
4 files changed, 8 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 18ad36d2b..9c299a9ef 100644 --- 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 343265c83..427394af4 100755 --- 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 dcd88d7c6..12e6ecab1 100644 --- 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 413114bac..a058a1fff 100644 --- 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 |