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-1/config.m4 (-14 / +11 lines)
Lines 3-32 Link Here
3
3
4
if test $PHP_MAGICKWAND != "no"; then
4
if test $PHP_MAGICKWAND != "no"; then
5
5
6
    if test -r $PHP_MAGICKWAND/bin/MagickWand-config; then
6
    if test -r $PHP_MAGICKWAND/bin/Wand-config; then
7
        WAND_CONFIG_PATH=$PHP_MAGICKWAND/bin
7
        WAND_CONFIG_PATH=$PHP_MAGICKWAND/bin
8
    else
8
    else
9
        AC_MSG_CHECKING(MagickWand-config in default path)
9
        AC_MSG_CHECKING(Wand-config in default path)
10
10
11
        for i in /usr/local /usr;
11
        for i in /usr/local /usr;
12
        do
12
        do
13
            test -r $i/bin/MagickWand-config && WAND_CONFIG_PATH=$i/bin && break
13
            test -r $i/bin/Wand-config && WAND_CONFIG_PATH=$i/bin && break
14
        done
14
        done
15
15
16
        if test -z "$WAND_CONFIG_PATH"; then
16
        if test -z "$WAND_CONFIG_PATH"; then
17
            for i in $PHP_MAGICKWAND /usr/local /usr;
17
            for i in $PHP_MAGICKWAND /usr/local /usr;
18
            do
18
            do
19
                test -r $i/MagickWand-config && WAND_CONFIG_PATH=$i && break
19
                test -r $i/Wand-config && WAND_CONFIG_PATH=$i && break
20
            done
20
            done
21
        fi
21
        fi
22
        if test -z "$WAND_CONFIG_PATH"; then
22
        if test -z "$WAND_CONFIG_PATH"; then
23
            AC_MSG_ERROR(Cannot locate configuration program MagickWand-config)
23
            AC_MSG_ERROR(Cannot locate configuration program Wand-config)
24
        else
24
        else
25
            AC_MSG_RESULT(found in $WAND_CONFIG_PATH)
25
            AC_MSG_RESULT(found in $WAND_CONFIG_PATH)
26
        fi
26
        fi
27
    fi
27
    fi
28
28
29
		IMAGEMAGICK_VERSION_ORIG=`$WAND_CONFIG_PATH/MagickWand-config --version`
29
		IMAGEMAGICK_VERSION_ORIG=`$WAND_CONFIG_PATH/Wand-config --version`
30
		IMAGEMAGICK_VERSION_MASK=`echo ${IMAGEMAGICK_VERSION_ORIG} | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
30
		IMAGEMAGICK_VERSION_MASK=`echo ${IMAGEMAGICK_VERSION_ORIG} | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
31
31
32
32
Lines 34-40 Link Here
34
		if test "$IMAGEMAGICK_VERSION_MASK" -ge 6003005; then
34
		if test "$IMAGEMAGICK_VERSION_MASK" -ge 6003005; then
35
				AC_MSG_RESULT(found version $IMAGEMAGICK_VERSION_ORIG)
35
				AC_MSG_RESULT(found version $IMAGEMAGICK_VERSION_ORIG)
36
		else
36
		else
37
				AC_MSG_ERROR(no. You need at least ImageMagick version 6.3.8 to use MagickWand for PHP.)
37
				AC_MSG_ERROR(no. You need at least ImageMagick version 6.3.5 to use MagickWand for PHP.)
38
		fi
38
		fi
39
39
40
		AC_MSG_CHECKING(if PHP version is at least 4.1.3)
40
		AC_MSG_CHECKING(if PHP version is at least 4.1.3)
Lines 63-78 Link Here
63
63
64
		AC_DEFINE(HAVE_MAGICKWAND,1,[ ])
64
		AC_DEFINE(HAVE_MAGICKWAND,1,[ ])
65
65
66
		PHP_ADD_LIBRARY_WITH_PATH(MagickCore, $WAND_DIR/lib, MAGICKWAND_SHARED_LIBADD)
66
		AC_MSG_CHECKING(Wand-config --cppflags)
67
		PHP_ADD_LIBRARY_WITH_PATH(MagickWand, $WAND_DIR/lib, MAGICKWAND_SHARED_LIBADD)
67
		WAND_CPPFLAGS="`$WAND_CONFIG_PATH/Wand-config --cppflags`"
68
		PHP_ADD_INCLUDE($WAND_DIR/include/ImageMagick)
69
		AC_MSG_CHECKING(MagickWand-config --cppflags)
70
		WAND_CPPFLAGS="`$WAND_CONFIG_PATH/MagickWand-config --cppflags`"
71
		AC_MSG_RESULT($WAND_CPPFLAGS)
68
		AC_MSG_RESULT($WAND_CPPFLAGS)
72
		PHP_EVAL_INCLINE($WAND_CPPFLAGS)
69
		PHP_EVAL_INCLINE($WAND_CPPFLAGS)
73
70
74
		AC_MSG_CHECKING(MagickWand-config --libs)
71
		AC_MSG_CHECKING(Wand-config --libs)
75
		WAND_LIBS="`$WAND_CONFIG_PATH/MagickWand-config --libs`"
72
		WAND_LIBS="`$WAND_CONFIG_PATH/Wand-config --libs`"
76
		AC_MSG_RESULT($WAND_LIBS)
73
		AC_MSG_RESULT($WAND_LIBS)
77
		PHP_EVAL_LIBLINE($WAND_LIBS, MAGICKWAND_SHARED_LIBADD)
74
		PHP_EVAL_LIBLINE($WAND_LIBS, MAGICKWAND_SHARED_LIBADD)
78
75

Return to bug 215671