Attempt to fix configure and Makefile.