--- trunk/autogen.sh    Wed Sep 26 22:40:52 2007
+++ lighttpd-1.5/autogen.sh     Wed Sep 26 22:31:21 2007
@@ -47,6 +47,18 @@
   fi
 fi
 
+if test x$AUTOM4TE = x; then
+  if test \! x`which autom4te-2.59 2> /dev/null` = x; then
+    AUTOM4TE=autom4te-2.59
+  elif test \! x`which autom4te259 2> /dev/null` = x; then
+    AUTOM4TE=autom4te259
+  elif test \! x`which autom4te 2> /dev/null` = x; then
+    AUTOM4TE=autom4te
+  else
+    echo "autom4te 2.59+ wasn't found, exiting"; exit 0
+  fi
+fi
+
 if test x$AUTOMAKE = x; then
   if test \! x`which automake-1.9 2> /dev/null` = x; then
     AUTOMAKE=automake-1.9
@@ -85,6 +97,13 @@
   fi
 fi
 
+export LIBTOOLIZE
+export ACLOCAL
+export AUTOHEADER
+export AUTOMAKE
+export AUTOCONF
+export AUTOHEADER
+export AUTOM4TE
 
 run $LIBTOOLIZE $LIBTOOLIZE_FLAGS
 run $ACLOCAL $ACLOCAL_FLAGS