Log Message:
Fix execution of 'configure' under shells that dislike if-fi with no
intermediate block (Linux here, but probably Solaris too).

Whilst here, remove a cosmetic patch hunk.