From ad2d5d7e3a84d35b819e959d6ebab782f5d75b83 Mon Sep 17 00:00:00 2001
From: Michael Krelin <hacker@klever.net>
Date: Sat, 25 Apr 2009 19:00:57 +0000
Subject: Merge commit 'cheetah/master' into next

Conflicts:
	autogen.sh
---
diff --git a/autogen.sh b/autogen.sh
index 52b32cc..578206d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
-WANT_AUTOMAKE=1.8
-export WANT_AUTOMAKE
-libtoolize -f \
+tool_libtoolize="$(type -P glibtoolize || type -P libtoolize)"
+if test -z "$tool_libtoolize" ; then
+ echo "Failed to find libtoolize." ; exit 1;
+fi
+   "$tool_libtoolize" -f \
 && aclocal -I aclocal.d \
 && autoheader \
 && automake -a \
--
cgit v0.9.0.2