Fix some autoconf breakage.