Don't nest AC_MSG_CHECKING calls, it produces confuing output.
Merge branch 'maint'