Moved inclusion of macros directory from autogen.sh to Makefile.am
Fixed some underquoted macros in configure.ac