Merge branch 'issue/1064-add-m4-files-for-autoconf'. Refs #1064.
http://redmine.named-data.net/issues/1064