Updated from configure.in