autogen.sh update from Nelson