Updated for use of autogen.sh