configure and makefile updates