Fix merge issues in configure.ac