From 0f6f352ccbf14be45a21465ca0896295cd3f6654 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 7 Oct 1996 15:52:43 +0000 Subject: [PATCH] Moved rxs into global constants --- ChangeLog | 4 ++++ automake.in | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c17de192..975d1e18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ Sun Oct 6 00:43:01 1996 Tom Tromey + * 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 e6464ed0..10d8e7ab 100755 --- 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; -- 2.43.5