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

[Vincent Untz <vuntz src gnome org>]

commit c12e502b3aa418e0fb5dd0f0c0806f0a61414b6b
Author: Vincent Untz <vuntz gnome org>
Date:   Fri Feb 4 12:01:41 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 fc77baa..0329afe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = headers schemas po
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 pkgconfigdir = $(datadir)/pkgconfig
 pkgconfig_DATA = gsettings-desktop-schemas.pc
diff --git a/configure.ac b/configure.ac
index e5cc1e7..72c05f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,9 +8,6 @@ AC_CONFIG_MACRO_DIR([m4])
 
 AM_MAINTAINER_MODE
 
-dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
-AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS")
-
 AC_PROG_SED
 
 GLIB_GSETTINGS