AC_CONFIG_HEADERS to please automake 1.13
Update Makefiles for new automake
Update another makefile
Merge pull request #4 from dmashal/master

Update for autoconf 1.13