[cvs-nhc98] Tweak top-level Makefile and configure script for new vers