Squash warnings and spurious output from autogen.sh

diff --git a/Makefile.am b/Makefile.am
index a48e7069b0ca2e4a82e242794cb24adb5b68c191..73a34f42213cdfcf0cb4181c02de6a12f10bdf80 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,3 +65,5 @@ update-authors:
 
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+
+ACLOCAL_AMFLAGS = -I m4

diff --git a/autogen.sh b/autogen.sh
index 7c2ae062442f539728261f3f27f733a961e38afa..4e9fa3b60ff6edcaa025111f0d7448e827e413c3 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -70,7 +70,6 @@ fi
 
 libtoolize --copy --force
 
-echo $ACLOCAL $ACLOCAL_FLAGS
 $ACLOCAL $ACLOCAL_FLAGS
 
 ## optionally feature autoheader

diff --git a/configure.in b/configure.in
index c6e676492ab240f1dc805f2b3774872bbebf8a7f..4dda1fa1acf10ed579452b04bff1f81ca223ecaf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -12,6 +12,8 @@ AC_CANONICAL_HOST
 AC_LIBTOOL_WIN32_DLL
 AC_LIBTOOL_RC
 
+AC_CONFIG_MACRO_DIR([m4])
+
 AM_INIT_AUTOMAKE([1.9 tar-ustar])
 AM_CONFIG_HEADER(config.h)