From cdc5432fcd2621950928be6356dbe0d3c396ba62 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 27 Aug 2000 20:13:19 +0000 Subject: [PATCH] * automake.in (am_primary_prefixes): Don't set `valid' for configure variables that don't satisfy the other constraints. Fixes PR automake/68. --- ChangeLog | 6 ++++++ automake.in | 18 +++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 63b206c5..ca44054f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2000-08-27 Tom Tromey + + * automake.in (am_primary_prefixes): Don't set `valid' for + configure variables that don't satisfy the other constraints. + Fixes PR automake/68. + 2000-04-14 Victor V. Vengerov Fix for PR automake/67. diff --git a/automake.in b/automake.in index 99534438..9842b821 100755 --- a/automake.in +++ b/automake.in @@ -7013,15 +7013,15 @@ sub am_primary_prefixes if ($varname =~ /^(nobase_)?(dist_|nodist_)?(.*)_$primary$/) { if (($2 ne '' && ! $can_dist) - || (! defined $valid{$3} - && ! &variable_defined ($3 . 'dir') - # Note that a configure variable is always - # legitimate. It is natural to name such - # variables after the primary, so we explicitly - # allow it. - && ! defined $configure_vars{$varname})) - { - &am_line_error ($varname, "invalid variable \`$varname'"); + || (! defined $valid{$3} && ! &variable_defined ($3 . 'dir'))) + { + # Note that a configure variable is always legitimate. + # It is natural to name such variables after the + # primary, so we explicitly allow it. + if (! defined $configure_vars{$varname}) + { + &am_line_error ($varname, "invalid variable \`$varname'"); + } } else { -- 2.43.5