diff --git a/autogen.sh b/autogen.sh
index c7e0f6a..706351a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,54 +1,48 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
+ACLOCAL_FLAGS="-I m4 $ACLOCAL_FLAGS"
+LIBTOOLIZE_FLAGS="--force $LIBTOOLIZE_FLAGS"
+AUTOMAKE_FLAGS="--add-missing --copy --foreign $AUTOMAKE_FLAGS"
+
+LIBTOOLIZE=`which libtoolize`
+if [ "$LIBTOOLIZE" = "" ]; then
+        LIBTOOLIZE=`which glibtoolize`
+fi
+if [ "$LIBTOOLIZE" = "" ]; then
+        echo "libtoolize not found" 1>&2
+        exit 1
+fi
+
 echo "+ making misc files ..."
 touch NEWS README AUTHORS ChangeLog
 echo
-echo
+$LIBTOOLIZE $LIBTOOLIZE_FLAGS || {
+	echo "libtoolize failed"
+	exit 1
+}
 echo
 echo "+ running aclocal ..."
 aclocal $ACLOCAL_FLAGS || {
-  echo
-  echo "aclocal failed - check that all needed development files are present on system"
-  exit 1
+	echo "aclocal failed - check that all needed development files are present on system"
+	exit 1
 }
 echo
-echo
-echo
 echo "+ running autoheader ... "
 autoheader || {
-  echo
-  echo "autoheader failed"
-  exit 1
+	echo "autoheader failed"
+	exit 1
 }
 echo
-echo
-echo
-echo "+ running libtoolize ... "
-libtoolize --force || {
-  echo
-  echo "libtoolize failed"
-  exit 1
-}
-echo
-echo
-echo
 echo "+ running autoconf ... "
 autoconf || {
-  echo
-  echo "autoconf failed"
-  exit 1
+	echo "autoconf failed"
+	exit 1
 }
 echo
-echo
-echo
 echo "+ running automake ... "
-automake -a -c --foreign || {
-  echo
-  echo "automake failed"
-  exit 1
+automake $AUTOMAKE_FLAGS || {
+	echo "automake failed"
+	exit 1
 }
-echo
-echo
-echo