More acinclude.m4 improvements for MSYS2 support