more autoconf/automake patches from Matt