--- configure.orig	2010-01-28 22:11:16.000000000 +0100
+++ configure	2010-01-28 22:13:15.000000000 +0100
@@ -6135,7 +6135,7 @@ $as_echo "$as_me: error: cairo library n
 
 	{ $as_echo "$as_me:$LINENO: checking for cairo php extension" >&5
 $as_echo_n "checking for cairo php extension... " >&6; }
-	if test -f "$phpincludedir/ext/cairo/php_cairo_api.h"; then
+	if test -f "`pwd`/php_cairo_api.h"; then
 
   if test "$phpincludedir/ext/cairo" != "/usr/include"; then
 
@@ -6143,10 +6143,10 @@ $as_echo_n "checking for cairo php exten
     ai_p=$phpincludedir/ext/cairo
   else
 
-    ep_dir="`echo $phpincludedir/ext/cairo|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo pwd|$SED 's%/*[^/][^/]*/*$%%'`"
 
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$phpincludedir/ext/cairo\"`"
+    ai_p="$ep_realdir/`basename \"`pwd`\"`"
   fi