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



commit 8a1f51ee73c6c6702c0f3efa8a30981d50d267f0
Author: Vincent Untz <vuntz gnome org>
Date:   Fri Feb 4 12:01:34 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 acc92f8..a0f2cd5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = Pessulus data po
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 bin_SCRIPTS = pessulus
 
diff --git a/configure.ac b/configure.ac
index 160bf24..4d67b1f 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")
-
 PKG_CHECK_MODULES([PESSULUS], [pygtk-2.0 >= 2.13.0])
 
 GETTEXT_PACKAGE=pessulus



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]