Updated to latest autoconf macros