Merge branch 'maint'

* maint:
  Use AC_DEFUN_ONCE to define AM_PROG_CC_C_O
  compile: avoid AC_PROG_CC messy rewrite
  options: tiny simplification in dealing with incompatible versions

diff --cc lib/Automake/Options.pm
Simple merge

diff --cc m4/init.m4
Simple merge