Mixed changes to configure.ac