* m4/init.m4 (AM_INIT_AUTOMAKE): Simplify m4_pattern_allow

	invocation.

diff --git a/ChangeLog b/ChangeLog
index 5ca5efbfba35e50b8a282a9731f6fb47a43a3bf4..492a80624363775799f326e062bb54f4722986e7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-20  Tom Tromey  <tromey@redhat.com>
+
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Simplify m4_pattern_allow
+       invocation.
+
 2001-02-18  Tom Tromey  <tromey@redhat.com>
 
        * m4/strip.m4 (AM_PROG_INSTALL_STRIP): Don't call AM_PROG_STRIP.

diff --git a/m4/init.m4 b/m4/init.m4
index 43850873c8dfd1a8f0a0f2b34981d34465ff3124..7805ec690616702bfc62500abe5069f4530c1b3e 100644 (file)
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -49,13 +49,8 @@ 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])])
+ifdef([m4_pattern_allow],
+      [m4_pattern_allow([^AM_(C|CPP|CXX|OBJC|F|R|GCJ)FLAGS])])dnl
 
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl