From 6735f80b4b43b4c63dd0e3b982a5032509596a5d Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu, 11 Nov 2010 12:03:24 +0000
Subject: [PATCH] build: Sanitize the hack for ACLOCAL_FLAGS

Move the ACLOCAL_FLAGS hack we have to use with jhbuild and autoreconf
inside the ACLOCAL_AMFLAGS declaration in Makefile.am, and leave
autogen.sh alone.
---
 Makefile.am | 5 ++++-
 autogen.sh  | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7abedfc66..11bfa7da1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,10 @@ NULL =
 
 SUBDIRS = build clutter tests doc po
 
-ACLOCAL_AMFLAGS = -I build/autotools
+# XXX - this is a massive hack to make autoreconf honour the ACLOCAL_FLAGS
+# that jhbuild sets while still retaining build/autotools as the authoritative
+# source for m4 macros
+ACLOCAL_AMFLAGS = -I build/autotools ${ACLOCAL_FLAGS}
 
 EXTRA_DIST = \
 	ChangeLog.pre-git-import	\
diff --git a/autogen.sh b/autogen.sh
index 86e518099..e84eda17c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -63,7 +63,7 @@ fi
 rm -rf autom4te.cache
 
 gtkdocize || exit $?
-autoreconf -vfi -I $srcdir/build/autotools ${ACLOCAL_FLAGS} || exit $?
+autoreconf -vfi || exit $?
 cd $ORIGDIR || exit $?
 
 if test -z "$NOCONFIGURE"; then