Restore support for automake 1.9.6 with autoconf 2.61.