Updated the autoconf script and makefile so that