Here is the least invasive patch I could do to fix the problem.  It is 
actually better than the previous solution also because it limits the 
number of interacting sed passes to resolve @if's, and it allows 
conditionals like "@if as-bootstrap".

I think it qualifies as an obvious fix but I don't have CVS available 
right now, would you please commit it for me to both gcc and src?

Thank you very much, I apologize.

Paolo