Re: Makefile and configure updates