autoconf fixes for 3.12.1