Moved rxs into global constants

diff --git a/ChangeLog b/ChangeLog
index c17de192355e1e3f985d0850d7ec7f14aac2b0e8..975d1e1841d2fdbe32445f795c96237741fcc881 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 Sun Oct  6 00:43:01 1996  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (AC_CONFIG_AUX_DIR_PATTERN): New global.
+       (AM_INIT_AUTOMAKE_PATTERN): New global.
+       (scan_configure): Use them.
+
        * aclocal.in (add_file): Search contents of included files.  Test
        req.test.
        (scan_m4_files): Don't skip acinclude.m4 when constructing

diff --git a/automake.in b/automake.in
index e6464ed05cb4c3e89f142d30c9cd39c40373bfb1..10d8e7aba06266b584f40770aa56e57cfcc52044 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -43,6 +43,11 @@ $MACRO_PATTERN = "^([A-Za-z][A-Za-z0-9_]*)[ \t]*:?=[ \t]*(.*)\$";
 $BOGUS_MACRO_PATTERN = "^([^ \t]*)[ \t]*:?=[ \t]*(.*)\$";
 $GNITS_VERSION_PATTERN = "[0-9]+\\.[0-9]+([a-z]|\\.[0-9]+)?";
 
+# Some regular expressions.  One reason to put them here is that it
+# makes indentation work better in Emacs.
+$AC_CONFIG_AUX_DIR_PATTERN = "AC_CONFIG_AUX_DIR\\(([^)]+)\\)";
+$AM_INIT_AUTOMAKE_PATTERN = "AM_INIT_AUTOMAKE\\([^,]*,([^)]+)\\)";
+
 # Constants to define the "strictness" level.
 $FOREIGN = 0;
 $GNU = 1;
@@ -2771,7 +2776,7 @@ sub scan_configure
            }
        }
 
-       if (/AC_CONFIG_AUX_DIR\(([^)]+)\)/)
+       if (/$AC_CONFIG_AUX_DIR_PATTERN/o)
        {
            @config_aux_path = $1;
        }
@@ -2826,7 +2831,7 @@ sub scan_configure
                                || /AC_(PATH|CHECK)_PROGS?\(YACC/);
 
         # This macro handles several different things.
-        if (/AM_INIT_AUTOMAKE\([^,]*,([^)]+)\)/)
+        if (/$AM_INIT_AUTOMAKE_PATTERN/o)
        {
            $seen_make_set = 1;
            $seen_package = 1;