1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
# allow usage of <imagemagick-6.3.8, bug 215671
# patch by Martin von Gagern <Martin.vGagern@gmx.net>
--- MagickWandForPHP-1.0.7-1/config.m4 2008-04-13 19:30:55.000000000 +0200
+++ MagickWandForPHP-1.0.7/config.m4 2008-06-10 11:34:24.000000000 +0200
@@ -3,30 +3,30 @@
if test $PHP_MAGICKWAND != "no"; then
- if test -r $PHP_MAGICKWAND/bin/MagickWand-config; then
+ if test -r $PHP_MAGICKWAND/bin/Wand-config; then
WAND_CONFIG_PATH=$PHP_MAGICKWAND/bin
else
- AC_MSG_CHECKING(MagickWand-config in default path)
+ AC_MSG_CHECKING(Wand-config in default path)
for i in /usr/local /usr;
do
- test -r $i/bin/MagickWand-config && WAND_CONFIG_PATH=$i/bin && break
+ test -r $i/bin/Wand-config && WAND_CONFIG_PATH=$i/bin && break
done
if test -z "$WAND_CONFIG_PATH"; then
for i in $PHP_MAGICKWAND /usr/local /usr;
do
- test -r $i/MagickWand-config && WAND_CONFIG_PATH=$i && break
+ test -r $i/Wand-config && WAND_CONFIG_PATH=$i && break
done
fi
if test -z "$WAND_CONFIG_PATH"; then
- AC_MSG_ERROR(Cannot locate configuration program MagickWand-config)
+ AC_MSG_ERROR(Cannot locate configuration program Wand-config)
else
AC_MSG_RESULT(found in $WAND_CONFIG_PATH)
fi
fi
- IMAGEMAGICK_VERSION_ORIG=`$WAND_CONFIG_PATH/MagickWand-config --version`
+ 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;}'`
@@ -34,7 +34,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)
@@ -63,16 +63,13 @@
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(MagickWand-config --cppflags)
- WAND_CPPFLAGS="`$WAND_CONFIG_PATH/MagickWand-config --cppflags`"
+ 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(MagickWand-config --libs)
- WAND_LIBS="`$WAND_CONFIG_PATH/MagickWand-config --libs`"
+ 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)
|
GitWeb
