Updated upstream copies of autoconf macros