| 1 | diff -u -r ../zbar-0.10/configure.ac ./configure.ac |
| 2 | --- ../zbar-0.10/configure.ac 2009-10-23 14:16:44.000000000 -0400 |
| 3 | +++ ./configure.ac 2016-05-03 09:00:57.495043230 -0400 |
| 4 | @@ -281,15 +281,7 @@ |
| 5 | ])])]) |
| 6 | MAGICK_VERSION=`$PKG_CONFIG MagickWand --modversion` |
| 7 | AC_MSG_NOTICE([using ImageMagick version $MAGICK_VERSION]) |
| 8 | - |
| 9 | -dnl double check ImageMagick install (bug #2582232) |
| 10 | - CPPFLAGS_save="$CPPFLAGS" |
| 11 | - CPPFLAGS="$CPPFLAGS $MAGICK_CFLAGS" |
| 12 | - AC_CHECK_HEADER([wand/MagickWand.h], [], |
| 13 | - [AC_MSG_FAILURE([ImageMagick package found but wand/MagickWand.h not installed?! |
| 14 | -this is a problem with your ImageMagick install, |
| 15 | -please resolve the inconsistency and try again...])]) |
| 16 | - CPPFLAGS="$CPPFLAGS_save"]) |
| 17 | + ]) |
| 18 | |
| 19 | AM_CONDITIONAL([HAVE_MAGICK], [test "x$with_imagemagick" = "xyes"]) |
| 20 | |