1.1 --- a/autogen.sh	Mon Jun 23 13:54:56 2008 -0400
     1.2 +++ b/autogen.sh	Thu Aug 25 14:22:52 2011 +0100
     1.3 @@ -47,6 +47,17 @@
     1.4    DIE=1
     1.5  }
     1.6  
     1.7 +if [ -z "$GNULIB_TOOL" ]; then
     1.8 +  GNULIB_TOOL=`which gnulib-tool`
     1.9 +  if [ -z "$GNULIB_TOOL" ]; then
    1.10 +    echo
    1.11 +    echo "**Error**: Missing gnulib-tool.  Set GNULIB_TOOL to point"
    1.12 +    echo "to a copy of gnulib-tool which is not in your PATH."
    1.13 +    echo "You can get gnulib from http://www.gnu.org/software/gnulib/"
    1.14 +    DIE=1
    1.15 +  fi
    1.16 +fi
    1.17 +
    1.18  if test "$DIE" -eq 1; then
    1.19    exit 1
    1.20  fi
    1.21 @@ -63,7 +74,7 @@
    1.22    am_opt=--include-deps;;
    1.23  esac
    1.24  
    1.25 -      aclocalinclude="$ACLOCAL_FLAGS"
    1.26 +      aclocalinclude="-I gl/m4 $ACLOCAL_FLAGS"
    1.27  
    1.28        if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
    1.29  	if test -z "$NO_LIBTOOLIZE" ; then 
    1.30 @@ -86,6 +97,9 @@
    1.31  
    1.32  gtkdocize --copy --flavour no-tmpl
    1.33  
    1.34 +echo "Running $GNULIB_TOOL --update ..."
    1.35 +$GNULIB_TOOL --update
    1.36 +
    1.37  conf_flags="--enable-maintainer-mode"
    1.38  
    1.39  if test x$NOCONFIGURE = x; then