Added more configure options and removed CPPFLAGS defines.