* automake.in (conditional_true_when): Use a hash, not index().

	Also, a TRUE component always results in a true return.
	Fixes test cond10.test.  For PR automake/164.
	* tests/Makefile.am (XFAIL_TESTS): Removed cond10.test.

diff --git a/ChangeLog b/ChangeLog
index d48a692b185cbfb64b2b7e89dab3dc19bf06c5f0..d19496ca1671bc50c987d79a4d0901540a7aad63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-05-05  Tom Tromey  <tromey@redhat.com>
+
+       * automake.in (conditional_true_when): Use a hash, not index().
+       Also, a TRUE component always results in a true return.
+       Fixes test cond10.test.  For PR automake/164.
+       * tests/Makefile.am (XFAIL_TESTS): Removed cond10.test.
+
 2001-05-05  Raja R Harinath  <harinath@cs.umn.edu>
 
        For PR automake/164:

diff --git a/automake.in b/automake.in
index 807a1722281771721d260b89219dd590c18c30b4..6c857dd1de85c2b7442c9b70f52e3d5562ca0cef 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -5487,13 +5487,15 @@ sub conditional_true_when ($$)
 {
     my ($cond, $when) = @_;
 
+    # Make a hash holding all the values from $WHEN.
+    my %cond_vals = map { $_ => 1 } split (' ', $when);
+
     # Check each component of $cond, which looks `COND1 COND2'.
     foreach my $comp (split (' ', $cond))
     {
-       if (index ($when, $comp) == -1)
-       {
-           return 0;
-       }
+       # TRUE is always true.
+       return 1 if $comp eq 'TRUE';
+       return 0 if ! defined $cond_vals{$comp};
     }
 
     return 1;

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3db461e460da2915006cd7f88cbd42cca8c9af47..e07bb33bc5a732a05e2c426c8e3108d66bc12715 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = gnits
 
-XFAIL_TESTS = man.test objc.test subobj2.test yaccvpath.test cond10.test
+XFAIL_TESTS = man.test objc.test subobj2.test yaccvpath.test
 
 TESTS =        \
 acinclude.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 47206b679b5ba3a7c78756c2a738f3753e7eae02..225c7c6e648937c170f52ade1d43410c4b9b91be 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -75,7 +75,7 @@ install_sh = @install_sh@
 
 AUTOMAKE_OPTIONS = gnits
 
-XFAIL_TESTS = man.test objc.test subobj2.test yaccvpath.test cond10.test
+XFAIL_TESTS = man.test objc.test subobj2.test yaccvpath.test
 
 TESTS = \
 acinclude.test \