Updated configure.ac
Makefile updated