sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

build: Sanitize the hack for ACLOCAL_FLAGS

Browse source 
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.
This commit is contained in:
Emmanuele Bassi 2010-11-11 12:03:24 +00:00
parent 6c53c9c849
commit 6735f80b4b
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile.am
View file

@ -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 \

2
autogen.sh
View file

@ -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