Fix broken merge for configure.in