--- a/autogen.sh	Tue Dec 08 18:48:25 2009 -0500
+++ b/autogen.sh	Wed Dec 09 01:36:50 2009 -0500
@@ -4,35 +4,7 @@
 
 set -e
 
-# Originally copied from the accelerated glx project.
-
-acincludeflags="-I m4"
-
-echo "calling libtoolize..."
-
-(libtoolize --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-        echo "You must have libtoolize (part of the libtool package)"
-	echo "installed to build Octave.  Download the appropriate"
-	echo "package for your distribution, or get the source"
-	echo "tarball at ftp://ftp.gnu.org/pub/gnu/"
-        exit 1
-}
-
-libtoolize
-
-echo "calling aclocal..."
-
-(aclocal --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-        echo "You must have aclocal (part of the automake package)"
-	echo "installed to build Octave.  Download the appropriate"
-	echo "package for your distribution, or get the source"
-	echo "tarball at ftp://ftp.gnu.org/pub/gnu/"
-        exit 1
-}
-
-aclocal $acincludeflags
+AUTOMAKE="automake --warnings=no-portability"
 
 echo "generating source lists for liboctave/Makefile..."
 
@@ -46,51 +18,6 @@
 
 (cd src/DLD-FUNCTIONS; ./config-module.sh)
 
-echo "calling autoheader..."
-
-(autoheader --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-        echo "You must have autoheader (part of the autoconf package)"
-	echo "installed to build Octave.  Download the appropriate"
-	echo "package for your distribution, or get the source"
-	echo "tarball at ftp://ftp.gnu.org/pub/gnu/"
-        exit 1
-}
-
-autoheader $acincludeflags --force
-
-echo "calling automake..."
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-        echo "You must have automake installed to build Octave."
-        echo "Download the appropriate package for your distribution,"
-        echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-        exit 1
-}
+echo "bootstrapping..."
 
-automake --warnings=no-portability --add-missing \
-  Makefile \
-  doc/Makefile \
-  doc/faq/Makefile \
-  doc/interpreter/Makefile \
-  doc/liboctave/Makefile \
-  doc/refcard/Makefile \
-  examples/Makefile \
-  libcruft/Makefile \
-  liboctave/Makefile \
-  scripts/Makefile \
-  src/Makefile \
-  test/Makefile
-
-echo "calling autoconf..."
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-        echo "You must have autoconf installed to build Octave."
-        echo "Download the appropriate package for your distribution,"
-        echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-        exit 1
-}
-
-autoconf $acincludeflags --force
+./bootstrap "$@"