Need more checks for autoconf
Cleanup Makefile.am