Clean-up configure.ac