Fixes from Pavel Roskin:

	* automake.in (variable_conditions_sub): Sort list passed to
	variable_conditions_permutations.
	(variable_conditions): Sort list before returning.

diff --git a/ChangeLog b/ChangeLog
index 7ef34db75030594e6f5605a85b28825a2d4878e5..677aef63b917c4a4d5f212331b06096720c5d316 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-03-01  Tom Tromey  <tromey@cygnus.com>
+
+       Fixes from Pavel Roskin:
+       * automake.in (variable_conditions_sub): Sort list passed to
+       variable_conditions_permutations.
+       (variable_conditions): Sort list before returning.
+
 1999-02-27  Tom Tromey  <tromey@cygnus.com>
 
        * automake.in (lang_extensions): New sub.

diff --git a/automake.in b/automake.in
index 8ccd2154f01b1c955121500ade65cbdde080d337..4923c9ab2da9abd007c66b023512a874919ebecc 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -5225,6 +5225,7 @@ sub variable_conditions
 {
     local ($var) = @_;
     local (%uniqify);
+    local (@uniq_list);
     local ($cond);
 
     %vars_scanned = ();
@@ -5233,7 +5234,10 @@ sub variable_conditions
        $uniqify{$cond} = 1;
     }
 
-    return keys %uniqify;
+    @uniq_list = sort keys %uniqify;
+    # Note we cannot just do `return sort keys %uniqify', because this
+    # function is sometimes used in a scalar context.
+    return @uniq_list;
 }
 
 # A subroutine of variable_conditions.  We only return conditions
@@ -5282,7 +5286,7 @@ sub variable_conditions_sub
        # definitions.
        delete $vars_scanned{$var};
 
-       return &variable_conditions_permutations (keys %allconds);
+       return &variable_conditions_permutations (sort keys %allconds);
     }
 
     local (@this_conds) = ();