Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 215671 | Differences between
and this patch

Collapse All | Expand All

(-)MagickWandForPHP-1.0.7.orig/config.m4 (-13 / +11 lines)
Lines 26-40 Link Here
26
        fi
26
        fi
27
    fi
27
    fi
28
28
29
		WAND_DIR=`$WAND_CONFIG_PATH/MagickWand-config --prefix`
30
		AC_MSG_CHECKING(for MagickWand.h header file)
31
32
		if test -r $WAND_DIR/include/ImageMagick/wand/MagickWand.h; then
33
				AC_MSG_RESULT(found in $WAND_DIR/include/ImageMagick/wand/MagickWand.h)
34
		else
35
				AC_MSG_ERROR(Cannot locate header file MagickWand.h)
36
		fi
37
38
29
39
		IMAGEMAGICK_VERSION_ORIG=`$WAND_CONFIG_PATH/MagickWand-config --version`
30
		IMAGEMAGICK_VERSION_ORIG=`$WAND_CONFIG_PATH/MagickWand-config --version`
40
		IMAGEMAGICK_VERSION_MASK=`echo ${IMAGEMAGICK_VERSION_ORIG} | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
31
		IMAGEMAGICK_VERSION_MASK=`echo ${IMAGEMAGICK_VERSION_ORIG} | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
Lines 44-50 Link Here
44
		if test "$IMAGEMAGICK_VERSION_MASK" -ge 6003005; then
35
		if test "$IMAGEMAGICK_VERSION_MASK" -ge 6003005; then
45
				AC_MSG_RESULT(found version $IMAGEMAGICK_VERSION_ORIG)
36
				AC_MSG_RESULT(found version $IMAGEMAGICK_VERSION_ORIG)
46
		else
37
		else
47
				AC_MSG_ERROR(no. You need at least ImageMagick version 6.3.8 to use MagickWand for PHP.)
38
				AC_MSG_ERROR(no. You need at least ImageMagick version 6.3.5 to use MagickWand for PHP.)
48
		fi
39
		fi
49
40
50
		AC_MSG_CHECKING(if PHP version is at least 4.1.3)
41
		AC_MSG_CHECKING(if PHP version is at least 4.1.3)
Lines 73-81 Link Here
73
64
74
		AC_DEFINE(HAVE_MAGICKWAND,1,[ ])
65
		AC_DEFINE(HAVE_MAGICKWAND,1,[ ])
75
66
76
		PHP_ADD_LIBRARY_WITH_PATH(MagickCore, $WAND_DIR/lib, MAGICKWAND_SHARED_LIBADD)
67
		AC_MSG_CHECKING(Wand-config --cppflags)
77
		PHP_ADD_LIBRARY_WITH_PATH(MagickWand, $WAND_DIR/lib, MAGICKWAND_SHARED_LIBADD)
68
		WAND_CPPFLAGS="`$WAND_CONFIG_PATH/Wand-config --cppflags`"
78
		PHP_ADD_INCLUDE($WAND_DIR/include/ImageMagick)
69
		AC_MSG_RESULT($WAND_CPPFLAGS)
70
		PHP_EVAL_INCLINE($WAND_CPPFLAGS)
71
72
		AC_MSG_CHECKING(Wand-config --libs)
73
		WAND_LIBS="`$WAND_CONFIG_PATH/Wand-config --libs`"
74
		AC_MSG_RESULT($WAND_LIBS)
75
		PHP_EVAL_LIBLINE($WAND_LIBS, MAGICKWAND_SHARED_LIBADD)
76
79
		PHP_SUBST(MAGICKWAND_SHARED_LIBADD)
77
		PHP_SUBST(MAGICKWAND_SHARED_LIBADD)
80
		PHP_NEW_EXTENSION(magickwand, magickwand.c, $ext_shared)
78
		PHP_NEW_EXTENSION(magickwand, magickwand.c, $ext_shared)
81
79

Return to bug 215671