From 36133656acf7169b0e242a386e8cbed19a9466ad Mon Sep 17 00:00:00 2001
From: Will Thompson <will.thompson@collabora.co.uk>
Date: Wed, 8 Sep 2010 19:25:40 +0100
Subject: [PATCH] Squash warnings and spurious output from autogen.sh

---
 Makefile.am  | 2 ++
 autogen.sh   | 1 -
 configure.in | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index a48e706..73a34f4 100644
--- 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 7c2ae06..4e9fa3b 100755
--- 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 c6e6764..4dda1fa 100644
--- 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)
 
-- 
2.7.4