moved all relevant configuration options out of Makefile.configure
fixup
cleaned up the make file.