Update the configure scripts as well as the makefiles for the move from