summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2010-09-08 19:25:40 +0100
committerWill Thompson <will.thompson@collabora.co.uk>2010-10-05 11:45:48 +0100
commit36133656acf7169b0e242a386e8cbed19a9466ad (patch)
treea4ab2632324e4164eb3bc2b1846ff4f802535355
parent340d114cd0e6b065c7cc4b93b66c989e8108876e (diff)
downloaddbus-36133656acf7169b0e242a386e8cbed19a9466ad.tar.gz
dbus-36133656acf7169b0e242a386e8cbed19a9466ad.tar.bz2
dbus-36133656acf7169b0e242a386e8cbed19a9466ad.zip
Squash warnings and spurious output from autogen.sh
-rw-r--r--Makefile.am2
-rwxr-xr-xautogen.sh1
-rw-r--r--configure.in2
3 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index a48e7069..73a34f42 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 7c2ae062..4e9fa3b6 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 c6e67649..4dda1fa1 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)