Improving configure.ac and Makefile.in (5.2 version)