Adding appropriate changes to configure.ac and config.h
Will not compile, full integration in next commit.