Merge pull request #337 from nomis52/master

Autotools cleanup
Clean up the configure.ac file.