diff -ur cairo-1.10.2.orig/src/check-def.sh cairo-1.10.2/src/check-def.sh
--- cairo-1.10.2.orig/src/check-def.sh	2010-09-09 10:56:24.000000000 -0500
+++ cairo-1.10.2/src/check-def.sh	2011-03-16 17:04:20.839204997 -0500
@@ -3,11 +3,11 @@
 LC_ALL=C
 export LC_ALL
 
-if which nm 2>/dev/null >/dev/null; then
+if command -v nm 2>/dev/null >/dev/null; then
 	:
 else
 	echo "'nm' not found; skipping test"
-	exit 0
+	exit 77
 fi
 
 test -z "$srcdir" && srcdir=.
@@ -17,7 +17,7 @@
 $MAKE check-has-hidden-symbols.i > /dev/null || exit 1
 if tail -1 check-has-hidden-symbols.i | grep CAIRO_HAS_HIDDEN_SYMBOLS >/dev/null; then
 	echo "Compiler doesn't support symbol visibility; skipping test"
-	exit 0
+	exit 77
 fi
 
 if [ "`uname -s`" = "Linux" ]; then
diff -ur cairo-1.10.2.orig/src/check-doc-syntax.sh cairo-1.10.2/src/check-doc-syntax.sh
--- cairo-1.10.2.orig/src/check-doc-syntax.sh	2010-07-12 03:57:03.000000000 -0500
+++ cairo-1.10.2/src/check-doc-syntax.sh	2011-03-16 17:05:05.847952692 -0500
@@ -7,7 +7,7 @@
 	:
 else
 	echo "GNU grep not found; skipping test"
-	exit 0
+	exit 77
 fi
 
 test -z "$srcdir" && srcdir=.
diff -ur cairo-1.10.2.orig/src/check-plt.sh cairo-1.10.2/src/check-plt.sh
--- cairo-1.10.2.orig/src/check-plt.sh	2010-06-18 06:47:14.000000000 -0500
+++ cairo-1.10.2/src/check-plt.sh	2011-03-16 17:04:33.679395122 -0500
@@ -3,11 +3,11 @@
 LC_ALL=C
 export LC_ALL
 
-if which readelf 2>/dev/null >/dev/null; then
+if command -v readelf 2>/dev/null >/dev/null; then
 	:
 else
 	echo "'readelf' not found; skipping test"
-	exit 0
+	exit 77
 fi
 
 test -z "$srcdir" && srcdir=.
@@ -17,7 +17,7 @@
 $MAKE check-has-hidden-symbols.i > /dev/null || exit 1
 if tail -1 check-has-hidden-symbols.i | grep CAIRO_HAS_HIDDEN_SYMBOLS >/dev/null; then
 	echo "Compiler doesn't support symbol visibility; skipping test"
-	exit 0
+	exit 77
 fi
 
 for so in .libs/lib*.so; do