--- MagickWandForPHP-1.0.7.orig/config.m4	2008-04-13 18:37:28.000000000 +0200
+++ MagickWandForPHP-1.0.7/config.m4	2008-04-13 19:09:12.000000000 +0200
@@ -26,15 +26,6 @@
         fi
     fi
 
-		WAND_DIR=`$WAND_CONFIG_PATH/MagickWand-config --prefix`
-		AC_MSG_CHECKING(for MagickWand.h header file)
-
-		if test -r $WAND_DIR/include/ImageMagick/wand/MagickWand.h; then
-				AC_MSG_RESULT(found in $WAND_DIR/include/ImageMagick/wand/MagickWand.h)
-		else
-				AC_MSG_ERROR(Cannot locate header file MagickWand.h)
-		fi
-
 
 		IMAGEMAGICK_VERSION_ORIG=`$WAND_CONFIG_PATH/MagickWand-config --version`
 		IMAGEMAGICK_VERSION_MASK=`echo ${IMAGEMAGICK_VERSION_ORIG} | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
@@ -44,7 +35,7 @@
 		if test "$IMAGEMAGICK_VERSION_MASK" -ge 6003005; then
 				AC_MSG_RESULT(found version $IMAGEMAGICK_VERSION_ORIG)
 		else
-				AC_MSG_ERROR(no. You need at least ImageMagick version 6.3.8 to use MagickWand for PHP.)
+				AC_MSG_ERROR(no. You need at least ImageMagick version 6.3.5 to use MagickWand for PHP.)
 		fi
 
 		AC_MSG_CHECKING(if PHP version is at least 4.1.3)
@@ -73,9 +64,16 @@
 
 		AC_DEFINE(HAVE_MAGICKWAND,1,[ ])
 
-		PHP_ADD_LIBRARY_WITH_PATH(MagickCore, $WAND_DIR/lib, MAGICKWAND_SHARED_LIBADD)
-		PHP_ADD_LIBRARY_WITH_PATH(MagickWand, $WAND_DIR/lib, MAGICKWAND_SHARED_LIBADD)
-		PHP_ADD_INCLUDE($WAND_DIR/include/ImageMagick)
+		AC_MSG_CHECKING(Wand-config --cppflags)
+		WAND_CPPFLAGS="`$WAND_CONFIG_PATH/Wand-config --cppflags`"
+		AC_MSG_RESULT($WAND_CPPFLAGS)
+		PHP_EVAL_INCLINE($WAND_CPPFLAGS)
+
+		AC_MSG_CHECKING(Wand-config --libs)
+		WAND_LIBS="`$WAND_CONFIG_PATH/Wand-config --libs`"
+		AC_MSG_RESULT($WAND_LIBS)
+		PHP_EVAL_LIBLINE($WAND_LIBS, MAGICKWAND_SHARED_LIBADD)
+
 		PHP_SUBST(MAGICKWAND_SHARED_LIBADD)
 		PHP_NEW_EXTENSION(magickwand, magickwand.c, $ext_shared)