* automake.in (&variable_conditions): Be deterministic and Perl

version independent: sort the result.
(&variable_output, &variable_pretty_output): Sort all the @conds,
not only when defaulted.
* tests/cond3.test: Adjust.

diff --git a/ChangeLog b/ChangeLog
index dee500c41ddf4d9182b5503fbe3ff40fe653bee0..bf321fa0c0aec5ec2c9cb890908ed6f22857ef2c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-10-15  Akim Demaille  <akim@epita.fr>
+
+       * automake.in (&variable_conditions): Be deterministic and Perl
+       version independent: sort the result.
+       (&variable_output, &variable_pretty_output): Sort all the @conds,
+       not only when defaulted.
+       * tests/cond3.test: Adjust.
+
 2001-10-15  Akim Demaille  <akim@epita.fr>
 
        * automake.in: Formatting changes.

diff --git a/automake.in b/automake.in
index c796a1db69168a17856b1ecaafed78f80250e6f0..7a8db3595c44a20620f76415a7cd2018bc076906 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -5970,7 +5970,7 @@ sub variable_conditions ($)
 {
     my ($var) = @_;
     my @conds = keys %{$var_value{$var}};
-    return @conds;
+    return sort by_condition @conds;
 }
 
 
@@ -6412,13 +6412,13 @@ sub variable_output ($@)
 {
   my ($var, @conds) = @_;
 
-  @conds = sort by_condition keys %{$var_value{$var}}
+  @conds = keys %{$var_value{$var}}
     unless @conds;
 
   $output_vars .= $var_comment{$var}
     if defined $var_comment{$var};
 
-  foreach my $cond (@conds)
+  foreach my $cond (sort by_condition @conds)
     {
       my $val = $var_value{$var}{$cond};
       my $equals = $var_type{$var} eq ':' ? ':=' : '=';
@@ -6437,13 +6437,13 @@ sub variable_pretty_output ($@)
 {
   my ($var, @conds) = @_;
 
-  @conds = sort by_condition keys %{$var_value{$var}}
+  @conds = keys %{$var_value{$var}}
     unless @conds;
 
   $output_vars .= $var_comment{$var}
     if defined $var_comment{$var};
 
-  foreach my $cond (@conds)
+  foreach my $cond (sort by_condition @conds)
     {
       my $val = $var_value{$var}{$cond};
       my $equals = $var_type{$var} eq ':' ? ':=' : '=';

diff --git a/tests/cond3.test b/tests/cond3.test
index 810cc0058e7ada154bfd1a99974da617d8dc72b1..e98ab24b86da19cd12ee2e1077a2cc9a1c498a63 100755 (executable)
--- a/tests/cond3.test
+++ b/tests/cond3.test
@@ -54,10 +54,10 @@ sed -n '
 }' Makefile.in >produced
 
 cat >expected << 'EOF'
-@ONE_FALSE@am__objects_1 =
 @ONE_TRUE@am__objects_1 = one.$(OBJEXT)
-@TWO_FALSE@am__objects_2 =
+@ONE_FALSE@am__objects_1 =
 @TWO_TRUE@am__objects_2 = two.$(OBJEXT)
+@TWO_FALSE@am__objects_2 =
 @THREE_TRUE@am__objects_3 = three.$(OBJEXT)
 @THREE_FALSE@am__objects_3 =
 am_targ_OBJECTS = $(am__objects_1) $(am__objects_2) $(am__objects_3)