Modernize automake init

http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_005fINIT_005fAUTOMAKE-invocation
Regenerate to get configure.ac in comments
Merge pull request #2 from scop/master

Trivial autotools tweaks