]>
Commit | Line | Data |
---|---|---|
b54d7b7f JR |
1 | --- dx-4.4.4/configure.ac.orig 2006-08-21 23:56:08.000000000 +0200 |
2 | +++ dx-4.4.4/configure.ac 2008-11-13 12:31:28.000000000 +0100 | |
3 | @@ -801,7 +800,10 @@ | |
4 | ||
5 | failed=0; | |
6 | passed=0; | |
7 | + old_CPPFLAGS="$CPPFLAGS" | |
8 | + CPPFLAGS="$CPPFLAGS -I/usr/include/ImageMagick" | |
9 | AC_CHECK_HEADER([magick/api.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`]) | |
10 | + CPPFLAGS="$old_CPPFLAGS" | |
11 | if test "$ARCH" = "intelnt" ; then | |
12 | AC_CHECK_LIB(CORE_RL_magick_,Hopen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) | |
13 | AC_MSG_CHECKING(if ImageMagick package is complete) | |
14 | @@ -836,7 +838,7 @@ | |
15 | ||
16 | if test "$HAVE_MC" = "yes" ; then | |
17 | LIB_MAGICK="`Magick-config --ldflags` `Magick-config --libs`" | |
18 | - AC_CHECK_LIB( Magick,GetImageInfo, passed=`expr $passed + 1`, failed=`expr $failed + 1`, [ $LIB_MAGICK ]) | |
19 | + AC_CHECK_LIB( MagickCore,GetImageInfo, passed=`expr $passed + 1`, failed=`expr $failed + 1`, [ $LIB_MAGICK ]) | |
20 | AC_MSG_CHECKING(if ImageMagick package is complete) | |
21 | if test $passed -gt 0 | |
22 | then | |
23 | @@ -850,7 +852,7 @@ | |
24 | LIB_MAGICK="$LIBS `Magick-config --ldflags` `Magick-config --libs`" | |
25 | dnl UNIQUIFY will remove duplicate library tokens leaving the last instance. | |
26 | AC_UTILS_UNIQUIFY($LIB_MAGICK, LIBS) | |
27 | - FMT_LIBS="$FMT_LIBS libMagick.a" | |
28 | + FMT_LIBS="$FMT_LIBS libMagickCore.a" | |
29 | AC_DEFINE(HAVE_LIBMAGICK, 1, [Define to 1 if you have the ImageMagick libraries]) | |
30 | AC_MSG_RESULT(yes) | |
31 | have_magick='yes' |