Revert "Change config.h.in to avoid clobbering command line defines, if given."

This reverts commit 4cde6569b4b82f4af6c5d32576b1b40bef914d60.