Cleanup the configure.ac in some sort of order... Minor.