Removed debugging information
Added support for autogen.sh as well