aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--macros/ChangeLog13
-rw-r--r--macros/aclocal-include.m42
2 files changed, 12 insertions, 3 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index 07e98f06d7..d2243e59d6 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,8 +1,15 @@
1999-03-10 Tomislav Vujec <tvujec@carnet.hr>
- * gnome.m4 (GNOME_INIT_HOOK): Wrapped position parameter in testing
- for additional inits. It gets expanded while generating configure,
- resulting in an empty parameter list - syntax error in for statement.
+ * aclocal-include.m4 (AM_ACLOCAL_INCLUDE): Add ACLOCAL_FLAGS in
+ ACLOCAL. This allows maintainer rules to work if any of the macros
+ change.
+
+1999-03-10 Tomislav Vujec <tvujec@carnet.hr>
+
+ * gnome.m4 (GNOME_INIT_HOOK): Wrapped position parameter in
+ testing for additional inits. It gets expanded while generating
+ configure, resulting in an empty parameter list - syntax error in
+ for statement.
1999-03-09 Raja R Harinath <harinath@cs.umn.edu>
diff --git a/macros/aclocal-include.m4 b/macros/aclocal-include.m4
index dba50e8d3d..abf6533fe4 100644
--- a/macros/aclocal-include.m4
+++ b/macros/aclocal-include.m4
@@ -10,5 +10,7 @@ AC_DEFUN([AM_ACLOCAL_INCLUDE],
[
AM_CONDITIONAL(INSIDE_GNOME_COMMON, test x = y)
+ test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+
for k in $1 ; do ACLOCAL="$ACLOCAL -I $k" ; done
])