Add missing bits from autoconf