[gnome-desktop] build: Add ${ACLOCAL_FLAGS} to ACLOCAL_AMFLAGS

[Vincent Untz <vuntz src gnome org>]

commit 617b4a85af70e238a16388aac8766a87d78839c6
Author: Vincent Untz <vuntz gnome org>
Date:   Fri Feb 4 12:00:25 2011 +0100

    build: Add ${ACLOCAL_FLAGS} to ACLOCAL_AMFLAGS
    
    This is used by gnome-autogen.sh, and we need it when aclocal.m4 is
    to be rebuilt by make, to avoid losing some aclocal paths.
    
    Also, don't set ACLOCAL_AMFLAGS in configure.

 Makefile.am  |    2 +-
 configure.ac |    3 ---
 2 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index f0a51b3..8a80847 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ if DESKTOP_DOCS_ENABLED
 SUBDIRS += desktop-docs
 endif
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-scrollkeeper
 
diff --git a/configure.ac b/configure.ac
index c73a931..4db1891 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,9 +19,6 @@ AC_CONFIG_HEADERS([config.h])
 
 AC_CONFIG_MACRO_DIR([m4])
 
-dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
-AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")
-
 # Before making a release, the LT_VERSION string should be modified.
 # The string is of the form C:R:A.
 # - If interfaces have been changed or added, but binary compatibility has