Merge branch 'release-2.2.2'
m4: update autoconf macros

This fixes configure for autoconf 2.69
Merge branch 'fix_m4' of https://github.com/tmatth/toonloop into develop