modified the build system a bit, changes to autogen.sh reflect them.