From: Akim Demaille <akim@epita.fr>
Date: Mon, 15 Oct 2001 07:52:18 +0000 (+0000)
Subject: * automake.in (&variable_conditions): Be deterministic and Perl
X-Git-Tag: Release-1-5b~120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7abbcbd1792957fa5ce5906756eb4e8d993d0614;p=thirdparty%2Fautomake.git

* 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 dee500c41..bf321fa0c 100644
--- 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 c796a1db6..7a8db3595 100755
--- 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 810cc0058..e98ab24b8 100755
--- 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)