Clean up the configure.ac file.
Switch back to autoconf 2.57
Autoconf cleanup
Merge pull request #338 from nomis52/master

Clean up the configure.ac file.
Resync with trunk