rb7: fix exponential complexity in variable_conditionally_defined

[Richard Boulton]

This is a straightforward patch against HEAD to remove another case where
exponential complexity occurs.  It shouldn't change the (eventual)
behaviour of automake, and is similar to the other such patch applied only
to HEAD, so probably doesn't need an equivalent on branch-real-1.5

-- 
Richard

patch2
Description: Text document