Merge "autoconf: Use m4 conditionals where possible."