diff options
| author | Craig Keogh <cskeogh@adam.com.au> | 2011-02-04 20:58:12 +1030 |
|---|---|---|
| committer | Vincent Untz <vuntz@gnome.org> | 2011-02-04 12:09:19 +0100 |
| commit | 5a031a7240f8eafa516916431996d61d83304c66 (patch) | |
| tree | 5ee34b9d55d311238979d656bb9982f11f015ea8 | |
| parent | e7ee8a44871a93cc73e5db13faa27ea51e7dfb4c (diff) | |
| download | libgweather-5a031a7240f8eafa516916431996d61d83304c66.tar.gz | |
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
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | 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) |