Sure I'll do that now.

It just seemed like the convention was to use ifdefs in the code to handle
this so that's the way I did it. But using actual conditionals in the
makefile is certainly a much nicer way to do it.

I still don't have a verdict on compressing history - do we want that or
not?