[patch] Make better use of Wand-config

bug215671a.patch (text/plain), 1.38 KB, created by Martin von Gagern on 2008-04-13 15:24:24 UTC

--- MagickWandForPHP-1.0.6.orig/config.m4	2008-04-13 17:01:40.000000000 +0200
+++ MagickWandForPHP-1.0.6/config.m4	2008-04-13 17:11:57.000000000 +0200
@@ -26,15 +26,6 @@
         fi
     fi
 
-		WAND_DIR=`$WAND_CONFIG_PATH/Wand-config --prefix`
-		AC_MSG_CHECKING(for magick-wand.h header file)
-
-		if test -r $WAND_DIR/include/wand/magick-wand.h; then
-				AC_MSG_RESULT(found in $WAND_DIR/include/wand/magick-wand.h)
-		else
-				AC_MSG_ERROR(Cannot locate header file magick-wand.h)
-		fi
-
 
 		IMAGEMAGICK_VERSION_ORIG=`$WAND_CONFIG_PATH/Wand-config --version`
 		IMAGEMAGICK_VERSION_MASK=`echo ${IMAGEMAGICK_VERSION_ORIG} | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
@@ -73,9 +64,16 @@
 
 		AC_DEFINE(HAVE_MAGICKWAND,1,[ ])
 
-		PHP_ADD_LIBRARY_WITH_PATH(Magick, $WAND_DIR/lib, MAGICKWAND_SHARED_LIBADD)
-		PHP_ADD_LIBRARY_WITH_PATH(Wand, $WAND_DIR/lib, MAGICKWAND_SHARED_LIBADD)
-		PHP_ADD_INCLUDE($WAND_DIR/include)
+		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)