simplified and updated configure.ac