From fb06b43956355619a2513bfda41a32185be8a9c8 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 24 Feb 2011 15:58:01 +0000
Subject: [PATCH] Honour aclocal flags in Makefile.am, rather than gluing them
 onto ACLOCAL
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Part of a patch by Javier Jardón.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32245
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---
 Makefile.am  | 2 +-
 configure.ac | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index ac7dcb1..52b40e9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,6 +29,6 @@ update-authors:
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 include tools/lcov.am
diff --git a/configure.ac b/configure.ac
index e8ac2aa..42ec552 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,9 +15,6 @@ AC_CONFIG_MACRO_DIR([m4])
 
 AM_INIT_AUTOMAKE([1.10 tar-ustar -Wno-portability])
 
-# Honor aclocal flags
-ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
-
 GETTEXT_PACKAGE=dbus-1
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The name of the gettext domain])
-- 
2.7.4