Update the autoconf configure.ac script and Makefile.am templates so that