From 9080753a29a91f8acafc2d7fea727068aa2f6d0a Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Sat, 20 Oct 2001 11:18:06 +0000 Subject: [PATCH] * automake.in (&scan_autoconf_traces): Add support for AM_C_PROTOTYPES, AM_GNU_GETTEXT, AM_PROG_CC_C_O, and AC_CONFIG_AUX_DIR. * tests/alpha.test (configure.in): Automake wants a Makefile. --- ChangeLog | 8 ++++++++ automake.in | 35 +++++++++++++++++++++++++++++++---- tests/alpha.test | 1 + 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 25a8a17bb..afd487848 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2001-10-20 Akim Demaille + + * automake.in (&scan_autoconf_traces): Add support for + AM_C_PROTOTYPES, AM_GNU_GETTEXT, AM_PROG_CC_C_O, and + AC_CONFIG_AUX_DIR. + * tests/alpha.test (configure.in): Automake wants a Makefile. + + 2001-10-20 Akim Demaille * automake.in (scan_autoconf_traces): Use an unlikely to be used diff --git a/automake.in b/automake.in index e16735d34..2f34943e5 100755 --- a/automake.in +++ b/automake.in @@ -4444,8 +4444,17 @@ sub scan_autoconf_traces ($) { my ($filename) = @_; - my @traced = ('AC_CONFIG_FILES', 'AC_LIBSOURCE', 'AC_SUBST', - 'AM_CONDITIONAL', 'AM_INIT_AUTOMAKE'); + my @traced = ( + 'AC_CONFIG_AUX_DIR', + 'AC_CONFIG_FILES', + 'AC_LIBSOURCE', + 'AC_SUBST', + 'AM_CONDITIONAL', + 'AM_C_PROTOTYPES', + 'AM_GNU_GETTEXT', + 'AM_INIT_AUTOMAKE', + 'AM_PROG_CC_C_O', + ); my $traces = "$ENV{amtraces} "; @@ -4465,7 +4474,12 @@ sub scan_autoconf_traces ($) my $here = "$file:$line"; # Alphabetical ordering please. - if ($macro eq 'AC_CONFIG_FILES') + if ($macro eq 'AC_CONFIG_AUX_DIR') + { + @config_aux_path = $args[1]; + $config_aux_dir_set_in_configure_in = 1; + } + elsif ($macro eq 'AC_CONFIG_FILES') { # Look at potential Makefile.am's. &scan_autoconf_config_files ($args[1]); @@ -4486,12 +4500,25 @@ sub scan_autoconf_traces ($) { $configure_cond{$args[1]} = $here; } + elsif ($macro eq 'AM_C_PROTOTYPES') + { + $am_c_prototypes = $here; + } + elsif ($macro eq 'AM_GNU_GETTEXT') + { + $seen_gettext = $here; + $ac_gettext_line = $line; + } elsif ($macro eq 'AM_INIT_AUTOMAKE') { $package_version = $args[2]; - $package_version_line = $.; + $package_version_line = $line; $seen_init_automake = 1; } + elsif ($macro eq 'AM_PROG_CC_C_O') + { + $seen_cc_c_o = $here; + } } } diff --git a/tests/alpha.test b/tests/alpha.test index d24ada47e..829217d3e 100755 --- a/tests/alpha.test +++ b/tests/alpha.test @@ -7,6 +7,7 @@ cat > configure.in << 'END' AC_INIT AM_INIT_AUTOMAKE(zardoz, 1.5e) +AC_CONFIG_FILES(Makefile) END cat > Makefile.am << 'END' -- 2.47.2