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

[Vincent Untz <vuntz src gnome org>]

commit 9792ac69297dc003f5ba4d9461e15874ac1a6908
Author: Vincent Untz <vuntz gnome org>
Date:   Fri Feb 4 12:01:19 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 ed208e9..565ab87 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ if HAVE_PYTHON
 SUBDIRS += python simple-editor
 endif
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-python
 
diff --git a/configure.ac b/configure.ac
index 1432b47..badf772 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,9 +38,6 @@ AC_ARG_PROGRAM
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 
-dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
-AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS")
-
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.6.0 gio-2.0 >= 2.15.2)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)