[libgweather] build: Add ${ACLOCAL_FLAGS} to ACLOCAL_AMFLAGS

[Vincent Untz <vuntz src gnome org>]

commit 5a031a7240f8eafa516916431996d61d83304c66
Author: Craig Keogh <cskeogh adam com au>
Date:   Fri Feb 4 20:58:12 2011 +1030

    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.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=641472

 Makefile.am  |    2 +-
 configure.ac |    6 ------
 2 files changed, 1 insertions(+), 7 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index f049097..f3fab79 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = libgweather icons doc data po po-locations
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
 
diff --git a/configure.ac b/configure.ac
index 5f8ef8f..eabf29b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -210,12 +210,6 @@ if test -z "$ZONEINFO_DIR"; then
 fi
 AC_DEFINE_UNQUOTED(ZONEINFO_DIR, "$ZONEINFO_DIR", [zoneinfo directory])
 
-dnl ***************************************************************************
-dnl *** Honour aclocal flags                                                ***
-dnl ***************************************************************************
-ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
-AC_SUBST(ACLOCAL_AMFLAGS)
-
 AC_SUBST(VERSION)
 AC_SUBST(PACKAGE)
 AC_SUBST(DATADIR)