Re: let's trace?

Addendum the previous patch.

Index: ChangeLog
===================================================================
RCS file: /home/adl/CVSROOT/HEAD-20020412-2044/ChangeLog,v
retrieving revision 1.2
diff -u -r1.2 ChangeLog
--- ChangeLog   12 Apr 2002 21:28:02 -0000      1.2
+++ ChangeLog   13 Apr 2002 09:48:17 -0000
@@ -6,7 +6,7 @@
        'autoconf'.  Honnor the $filename argument.
        (scan_autoconf_files): Don't call scan_one_autoconf_file.
        Always call scan_autoconf_traces.
-       (scan_one_autoconf_file): Remove.
+       (scan_one_autoconf_file): Remove, with it associated regexes.
        (obsolete, obsolete_rx): Remove.
        (register_language, handle_languages): Remove the 'define_flag'
        support.  Remove it from the struct and language definitions too.
Index: automake.in
===================================================================
RCS file: /home/adl/CVSROOT/HEAD-20020412-2044/automake.in,v
retrieving revision 1.2
diff -u -r1.2 automake.in
--- automake.in 12 Apr 2002 21:28:02 -0000      1.2
+++ automake.in 13 Apr 2002 09:47:07 -0000
@@ -123,7 +123,9 @@
 my $prefix = "@prefix@";
 my $libdir = "@datadir@/@PACKAGE@-@APIVERSION@";
 
-# String constants.
+# Some regular expressions.  One reason to put them here is that it
+# makes indentation work better in Emacs.
+
 my $IGNORE_PATTERN = '^\s*##([^#\n].*)?\n';
 my $WHITE_PATTERN = '^\s*$';
 my $COMMENT_PATTERN = '^#';
@@ -153,23 +155,9 @@
                       . '|(\$\(srcdir\)/' . $PATH_PATTERN . ')'
                       . '|([^/\$]' . $PATH_PATTERN. '))\s*(#.*)?$');
 
-# Some regular expressions.  One reason to put them here is that it
-# makes indentation work better in Emacs.
-my $AC_CONFIG_AUX_DIR_PATTERN = 'AC_CONFIG_AUX_DIR\(([^)]+)\)';
-my $AM_INIT_AUTOMAKE_PATTERN = 'AM_INIT_AUTOMAKE\([^,]*,([^,)]+)[,)]';
-my $AC_INIT_PATTERN = 'AC_INIT\([^,]*,([^,)]+)[,)]';
-my $AM_PACKAGE_VERSION_PATTERN = '^\s*\[?([^]\s]+)\]?\s*$';
-
 # This handles substitution references like ${foo:.a=.b}.
 my $SUBST_REF_PATTERN = "^([^:]*):([^=]*)=(.*)\$";
 
-# Note that there is no AC_PATH_TOOL.  But we don't really care.
-my $AC_CHECK_PATTERN = 'AC_(CHECK|PATH)_(PROG|PROGS|TOOL)\(\[?(\w+)';
-my $AM_MISSING_PATTERN = 'AM_MISSING_PROG\(\[?(\w+)';
-# Just check for alphanumeric in AC_SUBST.  If you do AC_SUBST(5),
-# then too bad.
-my $AC_SUBST_PATTERN = 'AC_SUBST\(\[?(\w+)';
-my $AM_CONDITIONAL_PATTERN = 'AM_CONDITIONAL\(\[?(\w+)';
 # Match `-d' as a command-line argument in a string.
 my $DASH_D_PATTERN = "(^|\\s)-d(\\s|\$)";
 # Directories installed during 'install-exec' phase.

-- 
Alexandre Duret-Lutz