diff -r 63644cc28e0b -r b7e2d327239a autogen.sh
--- a/autogen.sh	Mon Jun 23 13:54:56 2008 -0400
+++ b/autogen.sh	Thu May 14 05:50:37 2009 +0100
@@ -47,6 +47,17 @@
   DIE=1
 }
 
+if [ -z "$GNULIB_TOOL" ]; then
+  GNULIB_TOOL=`which gnulib-tool`
+  if [ -z "$GNULIB_TOOL" ]; then
+    echo
+    echo "**Error**: Missing gnulib-tool.  Set GNULIB_TOOL to point"
+    echo "to a copy of gnulib-tool which is not in your PATH."
+    echo "You can get gnulib from http://www.gnu.org/software/gnulib/"
+    DIE=1
+  fi
+fi
+
 if test "$DIE" -eq 1; then
   exit 1
 fi
@@ -63,7 +74,7 @@
   am_opt=--include-deps;;
 esac
 
-      aclocalinclude="$ACLOCAL_FLAGS"
+      aclocalinclude="-I gl/m4 $ACLOCAL_FLAGS"
 
       if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
 	if test -z "$NO_LIBTOOLIZE" ; then 
@@ -86,6 +97,9 @@
 
 gtkdocize --copy --flavour no-tmpl
 
+echo "Running $GNULIB_TOOL --update ..."
+$GNULIB_TOOL --update
+
 conf_flags="--enable-maintainer-mode"
 
 if test x$NOCONFIGURE = x; then