Revert the redundant "=1" for -D. Drop a large block of comments
that does not belong in source. Change more 'dnl' to backslashes.