Removed double configure.ac
Some Makefile fixes and removed config.h
Remove double configure.ac and other fixes by joachimmetz