Updated to reflect upcoming autoconf 2.58 and automake 1.8