[cairo-commit] autogen.sh

[Behdad Esfahbod]

 autogen.sh |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 82303d6170aa541a3dc8c2519c7cc1445fc18842
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Aug 28 14:40:56 2008 -0400

    [autogen.sh] Handle case of no aclocal found

diff --git a/autogen.sh b/autogen.sh
index cf253ef..7e1e2fa 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -144,7 +144,7 @@ ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/`
 version_check libtool LIBTOOLIZE "$LIBTOOLIZE glibtoolize libtoolize" $libtoolize_min_vers \
     "http://ftp.gnu.org/pub/gnu/libtool/libtool-${libtool_min_vers}.tar.gz" || DIE=1
 
-if test -z "$ACLOCAL_FLAGS"; then
+if test -n "$ACLOCAL" && test -z "$ACLOCAL_FLAGS"; then
     acdir=`$ACLOCAL --print-ac-dir`
     if [ ! -f $acdir/pkg.m4 ]; then
 	echo "$ARGV0: Error: Could not find pkg-config macros."
@@ -155,11 +155,11 @@ if test -z "$ACLOCAL_FLAGS"; then
 	echo ""
 	echo "pkg-config is available from:"
 	echo "http://www.freedesktop.org/software/pkgconfig/"
-	DIE=yes
+	DIE=1
     fi
 fi
 
-if test "X$DIE" != X; then
+if test -n "$DIE"; then
   exit 1
 fi