2003-07-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (tiny change)

	* automake.in (scan_autoconf_traces): Trace AM_ENABLE_MULTILIB to
	render $seen_multilib functional again.

diff --git a/ChangeLog b/ChangeLog
index 78ed0992c9e2c68561e9b917a35f06b87210dd2d..bf0fca408da5745167ed430adc1b9e50d4f716e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-15  Ralf Corsepius <corsepiu@faw.uni-ulm.de>  (tiny change)
+
+       * automake.in (scan_autoconf_traces): Trace AM_ENABLE_MULTILIB to
+       render $seen_multilib functional again.
+
 2003-07-10  Raja R Harinath  <harinath@cs.umn.edu>
 
        Avoid using refs as hash keys.

diff --git a/automake.in b/automake.in
index 3b31fee6f233189d7f899ccbf4f943fcd912e118..214d5168e2a7530933eca8a7dd9eb312bcc91cf9 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -781,7 +781,7 @@ sub initialize_per_input ()
     $strictness = $default_strictness;
     $strictness_name = $default_strictness_name;
 
-    %options = 
+    %options =
       (
        # TRUE if --cygnus seen.
        'cygnus' => 0,
@@ -3708,7 +3708,7 @@ sub handle_configure ($$@)
      'MAKEFILE-AM-SOURCES' =>  "$input$colon_infile",
      'REGEN-ACLOCAL-M4'    => $regen_aclocal_m4,
      ACLOCAL_M4_DEPS       => "@aclocal_m4_deps");
-  
+
   if ($relative_dir eq '.')
     {
       &push_dist_common ('acconfig.h')
@@ -4492,6 +4492,7 @@ sub scan_autoconf_traces ($)
                AC_SUBST => 1,
                AM_AUTOMAKE_VERSION => 1,
                AM_CONDITIONAL => 2,
+               AM_ENABLE_MULTILIB => 0,
                AM_GNU_GETTEXT => 0,
                AM_INIT_AUTOMAKE => 0,
                AM_MAINTAINER_MODE => 0,
@@ -4591,6 +4592,10 @@ sub scan_autoconf_traces ($)
       elsif ($macro eq 'AM_CONDITIONAL')
        {
          $configure_cond{$args[1]} = $where;
+       }
+      elsif ($macro eq 'AM_ENABLE_MULTILIB')
+       {
+         $seen_multilib = $where;
        }
       elsif ($macro eq 'AM_GNU_GETTEXT')
        {
@@ -6430,7 +6435,7 @@ sub transform (%)
 {
   my (%pairs) = @_;
   my $result = '';
-  
+
   while (my ($token, $val) = each %pairs)
     {
       $result .= "s/\Q%$token%\E/\Q$val\E/gm;";
@@ -6445,7 +6450,7 @@ sub transform (%)
          $result .= "s/\Q%?$token%\E/FALSE/gm;";
        }
     }
-  
+
   return $result;
 }