Use quadrigraph '@%:@' for literal hash '#' characters in m4 scripts.

This helps prevent syntax highlighting editors from displaying these
lines as comments.  Also reformatted some of the autoconf tests
slightly to make the easier to read.
Ran bootstrap.