Fix some autoconf stuff and some eapi stuff so that build works again