diff --git a/autogen.sh b/autogen.sh
index 8b18250..060c6c4 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,10 +1,17 @@
-#! /bin/bash
+#!/bin/bash
 
 # $Id: autogen.sh 65 2004-12-24 19:51:17Z ctm $
 
-set -o errexit -o nounset -o noclobber
+#set -o errexit -o nounset -o noclobber
 
-libtoolize
+test -z "$LIBTOOL" && for LIBTOOL in glibtool libtool; do
+  ($LIBTOOL --version) < /dev/null > /dev/null 2>&1 && break
+done
+test -z "$LIBTOOLIZE" && for LIBTOOLIZE in glibtoolize libtoolize; do
+  ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 && break
+done
+
+$LIBTOOLIZE
 aclocal
 autoheader
 automake --add-missing