aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am3
-rwxr-xr-xautogen.sh7
-rw-r--r--config/.gitignore2
-rw-r--r--configure.ac1
4 files changed, 8 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index cea9db97b..23dc2572a 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 f9cd54297..76184b431 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,7 @@ AC_INIT
AC_LANG(C)
SPL_AC_META
AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_MACRO_DIR([config])
AC_CANONICAL_SYSTEM
AM_MAINTAINER_MODE
AM_SILENT_RULES