* configure.ac: Relocate some recent changes to a more logical location.