diff --git a/autogen.sh b/autogen.sh
index d3ab3f6..70bb3d5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,472 +1,202 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
-#name of package
-PKG_NAME=Bongo
-srcdir=${srcdir:-.}
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
 
-# default version requirements ...
-REQUIRED_AUTOCONF_VERSION=${REQUIRED_AUTOCONF_VERSION:-2.53}
-REQUIRED_AUTOMAKE_VERSION=${REQUIRED_AUTOMAKE_VERSION:-1.9}
-REQUIRED_LIBTOOL_VERSION=${REQUIRED_LIBTOOL_VERSION:-1.4.3}
-REQUIRED_GETTEXT_VERSION=${REQUIRED_GETTEXT_VERSION:-0.10.40}
-REQUIRED_GLIB_GETTEXT_VERSION=${REQUIRED_GLIB_GETTEXT_VERSION:-2.2.0}
-REQUIRED_INTLTOOL_VERSION=${REQUIRED_INTLTOOL_VERSION:-0.25}
-REQUIRED_PKG_CONFIG_VERSION=${REQUIRED_PKG_CONFIG_VERSION:-0.14.0}
-REQUIRED_GTK_DOC_VERSION=${REQUIRED_GTK_DOC_VERSION:-1.0}
-REQUIRED_DOC_COMMON_VERSION=${REQUIRED_DOC_COMMON_VERSION:-2.3.0}
+ORIGDIR=`pwd`
+cd $srcdir
+PROJECT=Bongo
 
-# a list of required m4 macros.  Package can set an initial value
-REQUIRED_M4MACROS=${REQUIRED_M4MACROS:-}
-FORBIDDEN_M4MACROS=${FORBIDDEN_M4MACROS:-}
-
-
-
-# Not all echo versions allow -n, so we check what is possible. This test is
-# based on the one in autoconf.
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ;;
-  *c*,*  ) ECHO_N=-n ;;
-  *)       ECHO_N= ;;
-esac
-
-# if GNOME2_DIR or GNOME2_PATH is set, modify ACLOCAL_FLAGS ...
-# NOTE: GNOME2_DIR is deprecated (as of Jan 2004), but is left here for
-# backwards-compatibility. You should be using GNOME2_PATH, since that is also
-# understood by libraries such as libgnome.
-if [ -n "$GNOME2_DIR" ]; then
-    echo "Using GNOME2_DIR is deprecated in gnome-common."
-    echo "Please use GNOME2_PATH instead (for compatibility with other GNOME pieces)."
-    ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS"
-    LD_LIBRARY_PATH_ADD=
-    for D in $P/lib* ; do
-        LD_LIBRARY_PATH_ADD="${LD_LIBRARY_PATH_ADD:+$LD_LIBRARY_PATH_ADD:}$GNOME2_DIR"
-    done
-    LD_LIBRARY_PATH="$LD_LIBRARY_PATH_ADD${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
-    PATH="$GNOME2_DIR/bin:$PATH"
-    export PATH
-    export LD_LIBRARY_PATH
-else
-    if [ -n "$GNOME2_PATH" ]; then
-        IFS="$IFS:"
-        LD_LIBRARY_PATH_ADD=
-        for P in $GNOME2_PATH ; do
-            if [ -d $P/share/aclocal ] ; then
-                ACLOCAL_FLAGS="-I $P/share/aclocal $ACLOCAL_FLAGS"
-            fi
-            for D in $P/lib* ; do
-                LD_LIBRARY_PATH_ADD="${LD_LIBRARY_PATH_ADD:+$LD_LIBRARY_PATH_ADD:}$D"
-            done
-            PATH="$P/bin:$PATH"
-        done
-        IFS="${IFS%:}"
-        LD_LIBRARY_PATH="$LD_LIBRARY_PATH_ADD${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
-        export PATH
-        export LD_LIBRARY_PATH
-    fi
-fi
+DIE=0
 
 # some terminal codes ...
 boldface="`tput bold 2>/dev/null`"
 normal="`tput sgr0 2>/dev/null`"
 printbold() {
-    echo $ECHO_N "$boldface"
-    echo "$@"
-    echo $ECHO_N "$normal"
+	echo "$boldface$@$normal"
 }    
 printerr() {
-    echo "$@" >&2
+	echo "$@" >&2
 }
 
-# Usage:
-#     compare_versions MIN_VERSION ACTUAL_VERSION
-# returns true if ACTUAL_VERSION >= MIN_VERSION
-compare_versions() {
-    ch_min_version=$1
-    ch_actual_version=$2
-    ch_status=0
-    IFS="${IFS=         }"; ch_save_IFS="$IFS"; IFS="."
-    set $ch_actual_version
-    for ch_min in $ch_min_version; do
-        ch_cur=`echo $1 | sed 's/[^0-9].*$//'`; shift # remove letter suffixes
-        if [ -z "$ch_min" ]; then break; fi
-        if [ -z "$ch_cur" ]; then ch_status=1; break; fi
-        if [ $ch_cur -gt $ch_min ]; then break; fi
-        if [ $ch_cur -lt $ch_min ]; then ch_status=1; break; fi
-    done
-    IFS="$ch_save_IFS"
-    return $ch_status
+have_libtool=false
+LIBTOOLIZE=libtoolize
+if $LIBTOOLIZE --version < /dev/null > /dev/null 2>&1 ; then
+	libtool_version=`libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+	case $libtool_version in 1.4*|1.5*|2.2*)
+		have_libtool=true
+		;;
+	esac
+fi
+if $have_libtool ; then : ; else
+	echo
+	echo "You must have libtool 1.4 installed to compile $PROJECT."
+	echo "Install the appropriate package for your distribution,"
+	echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
+	DIE=1
+fi
+
+(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+	echo
+	echo "You must have autoconf installed to compile $PROJECT."
+	echo "Install the appropriate package for your distribution,"
+	echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
+	DIE=1
 }
 
-# Usage:
-#     version_check PACKAGE VARIABLE CHECKPROGS MIN_VERSION SOURCE
-# checks to see if the package is available
-version_check() {
-    vc_package=$1
-    vc_variable=$2
-    vc_checkprogs=$3
-    vc_min_version=$4
-    vc_source=$5
-    vc_status=1
+if automake-1.8 --version < /dev/null > /dev/null 2>&1 ; then
+	AUTOMAKE=automake-1.8
+	ACLOCAL=aclocal-1.8
+elif automake-1.9 --version < /dev/null > /dev/null 2>&1 ; then
+	AUTOMAKE=automake-1.9
+	ACLOCAL=aclocal-1.9
+elif automake-1.10 --version < /dev/null > /dev/null 2>&1 ; then
+	AUTOMAKE=automake-1.10
+	ACLOCAL=aclocal-1.10
+else
+	echo
+	echo "You must have automake 1.8.x installed to compile $PROJECT."
+	echo "Install the appropriate package for your distribution,"
+	echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
+	DIE=1
+fi
 
-    vc_checkprog=`eval echo "\\$$vc_variable"`
-    if [ -n "$vc_checkprog" ]; then
-	printbold "using $vc_checkprog for $vc_package"
-	return 0
-    fi
+# need to check these binaries exist...
+AUTOCONF=autoconf
+AUTOHEADER=autoheader
 
-    printbold "checking for $vc_package >= $vc_min_version..."
-    for vc_checkprog in $vc_checkprogs; do
-	echo $ECHO_N "  testing $vc_checkprog... "
-	if $vc_checkprog --version < /dev/null > /dev/null 2>&1; then
-	    vc_actual_version=`$vc_checkprog --version | head -n 1 | \
-                               sed 's/^.*[ 	]\([0-9.]*[a-z]*\).*$/\1/'`
-	    if compare_versions $vc_min_version $vc_actual_version; then
-		echo "found $vc_actual_version"
-		# set variable
-		eval "$vc_variable=$vc_checkprog"
-		vc_status=0
-		break
-	    else
-		echo "too old (found version $vc_actual_version)"
-	    fi
-	else
-	    echo "not found."
+if test "$DIE" -eq 1; then
+	exit 1
+fi
+
+test -f configure.ac || {
+	echo "You must run this script in the top-level $PROJECT directory"
+	exit 1
+}
+
+if test -z "$AUTOGEN_SUBDIR_MODE"; then
+	if test -z "$*"; then
+		echo "I am going to run ./configure with no arguments - if you wish "
+		echo "to pass any to it, please specify them on the $0 command line."
 	fi
-    done
-    if [ "$vc_status" != 0 ]; then
-	printerr "***Error***: You must have $vc_package >= $vc_min_version installed"
-	printerr "  to build $PKG_NAME.  Download the appropriate package for"
-	printerr "  from your distribution or get the source tarball at"
-        printerr "    $vc_source"
-	printerr
-    fi
-    return $vc_status
-}
+fi
 
-# Usage:
-#     require_m4macro filename.m4
-# adds filename.m4 to the list of required macros
-require_m4macro() {
-    case "$REQUIRED_M4MACROS" in
-	$1\ * | *\ $1\ * | *\ $1) ;;
-	*) REQUIRED_M4MACROS="$REQUIRED_M4MACROS $1" ;;
-    esac
-}
+$ACLOCAL $ACLOCAL_FLAGS -I m4 -I macros || exit $?
 
-forbid_m4macro() {
-    case "$FORBIDDEN_M4MACROS" in
-	$1\ * | *\ $1\ * | *\ $1) ;;
-	*) FORBIDDEN_M4MACROS="$FORBIDDEN_M4MACROS $1" ;;
-    esac
-}
+$LIBTOOLIZE --force || exit $?
 
-# Usage:
-#     check_m4macros
-# Checks that all the requested macro files are in the aclocal macro path
-# Uses REQUIRED_M4MACROS and ACLOCAL variables.
-check_m4macros() {
-    # construct list of macro directories
-    cm_macrodirs="`$ACLOCAL --print-ac-dir`"
-	if [ `uname` = "FreeBSD" ]; then
-		ACLOCAL_FLAGS="-I /usr/local/share/aclocal"	
-	fi
-    set - $ACLOCAL_FLAGS
-    while [ $# -gt 0 ]; do
-	if [ "$1" = "-I" ]; then
-	    cm_macrodirs="$cm_macrodirs $2"
-	    shift
-	fi
-	shift
-    done
+$AUTOHEADER || exit $?
 
-    cm_status=0
-    if [ -n "$REQUIRED_M4MACROS" ]; then
-	printbold "Checking for required M4 macros..."
-	# check that each macro file is in one of the macro dirs
-	for cm_macro in $REQUIRED_M4MACROS; do
-	    cm_macrofound=false
-	    for cm_dir in $cm_macrodirs; do
-		if [ -f "$cm_dir/$cm_macro" ]; then
-		    cm_macrofound=true
-		    break
-		fi
-		# The macro dir in Cygwin environments may contain a file
-		# called dirlist containing other directories to look in.
-		if [ -f "$cm_dir/dirlist" ]; then
-		    for cm_otherdir in `cat $cm_dir/dirlist`; do
-			if [ -f "$cm_otherdir/$cm_macro" ]; then
-			    cm_macrofound=true
-		            break
-			fi
-		    done
-		fi
-	    done
-	    if $cm_macrofound; then
-		:
-	    else
-		printerr "  $cm_macro not found"
-		cm_status=1
-	    fi
-	done
-    fi
-    if [ -n "$FORBIDDEN_M4MACROS" ]; then
-	printbold "Checking for forbidden M4 macros..."
-	# check that each macro file is in one of the macro dirs
-	for cm_macro in $FORBIDDEN_M4MACROS; do
-	    cm_macrofound=false
-	    for cm_dir in $cm_macrodirs; do
-		if [ -f "$cm_dir/$cm_macro" ]; then
-		    cm_macrofound=true
-		    break
-		fi
-	    done
-	    if $cm_macrofound; then
-		printerr "  $cm_macro found (should be cleared from macros dir)"
-		cm_status=1
-	    fi
-	done
-    fi
-    if [ "$cm_status" != 0 ]; then
-	printerr "***Error***: some autoconf macros required to build $PKG_NAME"
-	printerr "  were not found in your aclocal path, or some forbidden"
-	printerr "  macros were found.  Perhaps you need to adjust your"
-	printerr "  ACLOCAL_FLAGS?"
-	printerr
-    fi
-    return $cm_status
-}
+$AUTOMAKE --add-missing || exit $?
+autoconf || exit $?
+cd $ORIGDIR || exit $?
 
-# try to catch the case where the macros2/ directory hasn't been cleared out.
-forbid_m4macro gnome-cxx-check.m4
-
-want_libtool=false
-want_gettext=false
-want_glib_gettext=false
-want_intltool=false
-want_pkg_config=false
-want_gtk_doc=false
+SVNREV="`svnversion . 2>/dev/null`"
+if test x$SVNREV = x; then
+	echo Unable to discern build version
+	echo \#define  BONGO_BUILD_BRANCH	\"unknown\" >  ./include/bongo-buildinfo.h
+	echo \#define  BONGO_BUILD_VSTR	\"\" >>  ./include/bongo-buildinfo.h
+	echo \#define  BONGO_BUILD_VER	\"0\" >>  ./include/bongo-buildinfo.h
+else
+	echo SVN Rev at $SVNREV
+	echo \#define  BONGO_BUILD_BRANCH	\"trunk\"   >  ./include/bongo-buildinfo.h
+	echo \#define  BONGO_BUILD_VSTR	\"r\" >>  ./include/bongo-buildinfo.h
+	echo \#define  BONGO_BUILD_VER	\"$SVNREV\" >> ./include/bongo-buildinfo.h
+fi
 
+# configure sub-projects
 configure_files="`find $srcdir -name 'bongo-*' -prune -name '{arch}' -prune -o -name configure.ac -print -o -name configure.in -print`"
-for configure_ac in $configure_files; do
-    if grep "^A[CM]_PROG_LIBTOOL" $configure_ac >/dev/null; then
-	want_libtool=true
-    fi
-    if grep "^AM_GNU_GETTEXT" $configure_ac >/dev/null; then
-	want_gettext=true
-    fi
-    if grep "^AM_GLIB_GNU_GETTEXT" $configure_ac >/dev/null; then
-	want_glib_gettext=true
-    fi
-    if grep "^AC_PROG_INTLTOOL" $configure_ac >/dev/null; then
-	want_intltool=true
-    fi
-    if grep "^PKG_CHECK_MODULES" $configure_ac >/dev/null; then
-	want_pkg_config=true
-    fi
-    if grep "^GTK_DOC_CHECK" $configure_ac >/dev/null; then
-	want_gtk_doc=true
-    fi
-done
-
-DIE=0
-
-#tell Mandrake autoconf wrapper we want autoconf 2.5x, not 2.13
-WANT_AUTOCONF_2_5=1
-export WANT_AUTOCONF_2_5
-version_check autoconf AUTOCONF 'autoconf2.50 autoconf autoconf-2.59 autoconf259' $REQUIRED_AUTOCONF_VERSION \
-    "http://ftp.gnu.org/pub/gnu/autoconf/autoconf-$REQUIRED_AUTOCONF_VERSION.tar.gz" || DIE=1
-AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/`
-
-case $REQUIRED_AUTOMAKE_VERSION in
-    1.7*) automake_progs="automake-1.7 automake-1.8 automake-1.9 automake19 automake-1.10" ;;
-    1.8*) automake_progs="automake-1.8 automake-1.9 automake19 automake-1.10" ;;
-    1.9*) automake_progs="automake-1.9 automake19 automake-1.10" ;;
-esac
-version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
-    "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" || DIE=1
-ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/`
-
-if $want_libtool; then
-    	version_check libtool LIBTOOLIZE 'libtoolize libtoolize15 glibtoolize' $REQUIRED_LIBTOOL_VERSION \
-        "http://ftp.gnu.org/pub/gnu/libtool/libtool-$REQUIRED_LIBTOOL_VERSION.tar.gz" || DIE=1
-#		if [ `uname` = "FreeBSD" ]; then
-#  			require_m4macro libtool15.m4
-#		fi
-		require_m4macro libtool.m4
-fi
-
-if $want_gettext; then
-    version_check gettext GETTEXTIZE gettextize $REQUIRED_GETTEXT_VERSION \
-        "http://ftp.gnu.org/pub/gnu/gettext/gettext-$REQUIRED_GETTEXT_VERSION.tar.gz" || DIE=1
-    require_m4macro gettext.m4
-fi
-
-if $want_glib_gettext; then
-    version_check glib-gettext GLIB_GETTEXTIZE glib-gettextize $REQUIRED_GLIB_GETTEXT_VERSION \
-        "ftp://ftp.gtk.org/pub/gtk/v2.2/glib-$REQUIRED_GLIB_GETTEXT_VERSION.tar.gz" || DIE=1
-    require_m4macro glib-gettext.m4
-fi
-
-if $want_intltool; then
-    version_check intltool INTLTOOLIZE intltoolize $REQUIRED_INTLTOOL_VERSION \
-        "http://ftp.gnome.org/pub/GNOME/sources/intltool/" || DIE=1
-    require_m4macro intltool.m4
-fi
-
-if $want_pkg_config; then
-    version_check pkg-config PKG_CONFIG pkg-config $REQUIRED_PKG_CONFIG_VERSION \
-        "'http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-$REQUIRED_PKG_CONFIG_VERSION.tar.gz" || DIE=1
-    require_m4macro pkg.m4
-fi
-
-if $want_gtk_doc; then
-    version_check gtk-doc GTKDOCIZE gtkdocize $REQUIRED_GTK_DOC_VERSION \
-        "http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/" || DIE=1
-    require_m4macro gtk-doc.m4
-fi
-
-if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then
-    version_check gnome-common DOC_COMMON gnome-doc-common \
-        $REQUIRED_DOC_COMMON_VERSION " " || DIE=1
-fi
-
-check_m4macros || DIE=1
-
-if [ "$DIE" -eq 1 ]; then
-  exit 1
-fi
-
-if test -z "$*"; then
-  printerr "**Warning**: I am going to run \`configure' with no arguments."
-  printerr "If you wish to pass any to it, please specify them on the"
-  printerr \`$0\'" command line."
-  printerr
-fi
-
 for arg in $@; do
-    case $arg in
-            --with-sqlite3=*import*)
-                    rm -f import/sqlite3/NO-AUTO-GEN
-                    ;;
-            --with-sqlite3=*)
-                    touch import/sqlite3/NO-AUTO-GEN
-                    echo "Flagging import/sqlite3 as no auto-gen as source is external"
-                    ;;
-    esac
+	case $arg in
+		--with-sqlite3=*import*)
+			rm -f import/sqlite3/NO-AUTO-GEN
+			;;
+		--with-sqlite3=*)
+			touch import/sqlite3/NO-AUTO-GEN
+			echo "Flagging import/sqlite3 as no auto-gen as source is external"
+			;;
+	esac
 done
 
 topdir=`pwd`
 for configure_ac in $configure_files; do 
-    dirname=`dirname $configure_ac`
-    basename=`basename $configure_ac`
-    if test -f $dirname/NO-AUTO-GEN; then
-	echo skipping $dirname -- flagged as no auto-gen
-    else
-	printbold "Processing $configure_ac"
-	cd $dirname
+	dirname=`dirname $configure_ac`
+	basename=`basename $configure_ac`
+	if test -f $dirname/NO-AUTO-GEN; then
+		echo skipping $dirname -- flagged as no auto-gen
+	else
+		printbold "Processing $configure_ac"
+		cd $dirname
 
-        # Note that the order these tools are called should match what
-        # autoconf's "autoupdate" package does.  See bug 138584 for
-        # details.
+		# Note that the order these tools are called should match what
+		# autoconf's "autoupdate" package does.  See bug 138584 for
+		# details.
 
-        # programs that might install new macros get run before aclocal
-	if grep "^A[CM]_PROG_LIBTOOL" $basename >/dev/null; then
-	    printbold "Running $LIBTOOLIZE..."
-	    $LIBTOOLIZE --force || exit 1
+		# programs that might install new macros get run before aclocal
+		if grep "^A[CM]_PROG_LIBTOOL" $basename >/dev/null; then
+			printbold "Running $LIBTOOLIZE..."
+			$LIBTOOLIZE --force || exit 1
+		fi
+
+		if grep "^AM_GLIB_GNU_GETTEXT" $basename >/dev/null; then
+			printbold "Running $GLIB_GETTEXTIZE... Ignore non-fatal messages."
+			echo "no" | $GLIB_GETTEXTIZE --force --copy || exit 1
+		elif grep "^AM_GNU_GETTEXT" $basename >/dev/null; then
+			if grep "^AM_GNU_GETTEXT_VERSION" $basename > /dev/null; then
+				printbold "Running autopoint..."
+				autopoint --force || exit 1
+			else
+				printbold "Running $GETTEXTIZE... Ignore non-fatal messages."
+				echo "no" | $GETTEXTIZE --force --copy --no-changelog || exit 1
+			fi
+		fi
+
+		if grep "^AC_PROG_INTLTOOL" $basename >/dev/null; then
+			printbold "Running $INTLTOOLIZE..."
+			$INTLTOOLIZE --force --automake || exit 1
+		fi
+
+		# Now run aclocal to pull in any additional macros needed
+		aclocalinclude="$ACLOCAL_FLAGS"
+		if test -d m4; then
+			aclocalinclude="$aclocalinclude -I m4"
+		fi
+		if test -d macros; then
+			aclocalinclude="$aclocalinclude -I macros"
+		fi
+
+		printbold "Running $ACLOCAL $aclocalinclude ..."
+		
+		$ACLOCAL $aclocalinclude || exit 1
+
+		# Now that all the macros are sorted, run autoconf and autoheader ...
+		printbold "Running $AUTOCONF..."
+		$AUTOCONF || exit 1
+		if grep "^A[CM]_CONFIG_HEADER" $basename >/dev/null; then
+			printbold "Running $AUTOHEADER..."
+			$AUTOHEADER || exit 1
+			# this prevents automake from thinking config.h.in is out of
+			# date, since autoheader doesn't touch the file if it doesn't
+			# change.
+			test -f config.h.in && touch config.h.in
+		fi
+
+		if test -f Makefile.am; then
+			# Finally, run automake to create the makefiles ...
+			printbold "Running $AUTOMAKE..."
+			$AUTOMAKE --gnu --add-missing || exit 1
+		fi
+
+		cd "$topdir"
 	fi
-
-	if grep "^AM_GLIB_GNU_GETTEXT" $basename >/dev/null; then
-	    printbold "Running $GLIB_GETTEXTIZE... Ignore non-fatal messages."
-	    echo "no" | $GLIB_GETTEXTIZE --force --copy || exit 1
-	elif grep "^AM_GNU_GETTEXT" $basename >/dev/null; then
-	   if grep "^AM_GNU_GETTEXT_VERSION" $basename > /dev/null; then
-	   	printbold "Running autopoint..."
-		autopoint --force || exit 1
-	   else
-	    	printbold "Running $GETTEXTIZE... Ignore non-fatal messages."
-	    	echo "no" | $GETTEXTIZE --force --copy --no-changelog || exit 1
-	   fi
-	fi
-
-	if grep "^AC_PROG_INTLTOOL" $basename >/dev/null; then
-	    printbold "Running $INTLTOOLIZE..."
-	    $INTLTOOLIZE --force --automake || exit 1
-	fi
-	if grep "^GTK_DOC_CHECK" $basename >/dev/null; then
-	    printbold "Running $GTKDOCIZE..."
-	    $GTKDOCIZE || exit 1
-	fi
-
-	if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then
-	    printbold "Running gnome-doc-common..."
-	    gnome-doc-common --copy || exit 1
-	fi
-
-        # Now run aclocal to pull in any additional macros needed
-	aclocalinclude="$ACLOCAL_FLAGS"
-	if test -d m4; then
-	    aclocalinclude="$aclocalinclude -I m4"
-	fi
-	if test -d macros; then
-	    aclocalinclude="$aclocalinclude -I macros"
-	fi
-
-	echo $aclocalinclude
-
-	printbold "Running $ACLOCAL $aclocalinclude ..."
-	
-	$ACLOCAL $aclocalinclude || exit 1
-
-	if grep "GNOME_AUTOGEN_OBSOLETE" aclocal.m4 >/dev/null; then
-	    printerr "*** obsolete gnome macros were used in $configure_ac"
-	fi
-
-	# Now that all the macros are sorted, run autoconf and autoheader ...
-	printbold "Running $AUTOCONF..."
-	$AUTOCONF || exit 1
-	if grep "^A[CM]_CONFIG_HEADER" $basename >/dev/null; then
-	    printbold "Running $AUTOHEADER..."
-	    $AUTOHEADER || exit 1
-	    # this prevents automake from thinking config.h.in is out of
-	    # date, since autoheader doesn't touch the file if it doesn't
-	    # change.
-	    test -f config.h.in && touch config.h.in
-	fi
-
-        if test -f Makefile.am; then
-	    # Finally, run automake to create the makefiles ...
-            printbold "Running $AUTOMAKE..."
-            $AUTOMAKE --gnu --add-missing || exit 1
-        fi
-
-	cd "$topdir"
-    fi
 done
+# end configure sub-projects
 
-# remove any flags which tell us not to autogen things
-#rm -f import/sqlite3/NO-AUTO-GEN
-
-SVNREV="`svnversion . 2>/dev/null`"
-if test x$SVNREV = x; then
-    echo Unable to discern build version
-    echo \#define  BONGO_BUILD_BRANCH	\"unknown\" >  ./include/bongo-buildinfo.h
-    echo \#define  BONGO_BUILD_VSTR	\"\" >>  ./include/bongo-buildinfo.h
-    echo \#define  BONGO_BUILD_VER	\"0\" >>  ./include/bongo-buildinfo.h
-else
-    echo SVN Rev at $SVNREV
-    echo \#define  BONGO_BUILD_BRANCH	\"trunk\"   >  ./include/bongo-buildinfo.h
-    echo \#define  BONGO_BUILD_VSTR	\"r\" >>  ./include/bongo-buildinfo.h
-    echo \#define  BONGO_BUILD_VER	\"$SVNREV\" >> ./include/bongo-buildinfo.h
+if test -z "$AUTOGEN_SUBDIR_MODE"; then
+	$srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
+	
+	echo 
+	echo "Now type 'make' to compile $PROJECT."
 fi
 
-conf_flags="--enable-maintainer-mode"
-
-if test x$NOCONFIGURE = x; then
-    printbold Running $srcdir/configure $conf_flags "$@" ...
-    $srcdir/configure $conf_flags "$@" \
-	|| exit 1
-    echo Now type \`make\' to compile $PKG_NAME 
-else
-    echo Skipping configure process.
-fi