* m4/init.m4 (AM_INIT_AUTOMAKE): Explicitly allow various AM_*

	names through autoconf.

diff --git a/ChangeLog b/ChangeLog
index 26dadd184d383e341044f63f0c6512e268b97635..09f74d5eec4a14abba91487a7abd2a85f0f2c882 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2001-02-12  Tom Tromey  <tromey@redhat.com>
 
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Explicitly allow various AM_*
+       names through autoconf.
+
        Fix for subdirbuiltsources.test:
        * automake.in (initialize_per_input): [all_target] Initialize to
        empty string.

diff --git a/m4/init.m4 b/m4/init.m4
index 064cf29a327a7bfb1a3329f5325502f29c0e762d..1afd69d2f5bd74690528473df83b2f324844064d 100644 (file)
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -47,6 +47,16 @@ ifelse([$3],,
 [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
 
+# Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
+# the ones we care about.
+ifdef([m4_pattern_allow], [m4_pattern_allow([AM_CFLAGS])])
+ifdef([m4_pattern_allow], [m4_pattern_allow([AM_CPPFLAGS])])
+ifdef([m4_pattern_allow], [m4_pattern_allow([AM_CXXFLAGS])])
+ifdef([m4_pattern_allow], [m4_pattern_allow([AM_OBJCFLAGS])])
+ifdef([m4_pattern_allow], [m4_pattern_allow([AM_FFLAGS])])
+ifdef([m4_pattern_allow], [m4_pattern_allow([AM_RFLAGS])])
+ifdef([m4_pattern_allow], [m4_pattern_allow([AM_GCJFLAGS])])
+
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl