diff options
| author | Joakim Verona | 2010-05-13 16:04:53 +0200 |
|---|---|---|
| committer | Joakim Verona | 2010-05-13 16:04:53 +0200 |
| commit | ef30d1ad3e9abe32001d8d863ae7314ca2a636f2 (patch) | |
| tree | c6b399fc725edfab600975d950fbeb34edd255e1 | |
| parent | ce07fa9adcea121b5515f98e161e257d1210c9b0 (diff) | |
| download | emacs-ef30d1ad3e9abe32001d8d863ae7314ca2a636f2.tar.gz emacs-ef30d1ad3e9abe32001d8d863ae7314ca2a636f2.zip | |
make configure.in less particular about themagickwand version
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | configure.in | 3 |
2 files changed, 2 insertions, 4 deletions
| @@ -11785,8 +11785,7 @@ fi | |||
| 11785 | 11785 | ||
| 11786 | HAVE_IMAGEMAGICK=no | 11786 | HAVE_IMAGEMAGICK=no |
| 11787 | if test "${with_imagemagick}" != "no"; then | 11787 | if test "${with_imagemagick}" != "no"; then |
| 11788 | IMAGEMAGICK_REQUIRED=1 | 11788 | IMAGEMAGICK_MODULE="Wand" |
| 11789 | IMAGEMAGICK_MODULE="MagickWand >= $IMAGEMAGICK_REQUIRED" | ||
| 11790 | 11789 | ||
| 11791 | succeeded=no | 11790 | succeeded=no |
| 11792 | 11791 | ||
diff --git a/configure.in b/configure.in index cd6500b51e1..58cace5895f 100644 --- a/configure.in +++ b/configure.in | |||
| @@ -1755,8 +1755,7 @@ fi | |||
| 1755 | 1755 | ||
| 1756 | HAVE_IMAGEMAGICK=no | 1756 | HAVE_IMAGEMAGICK=no |
| 1757 | if test "${with_imagemagick}" != "no"; then | 1757 | if test "${with_imagemagick}" != "no"; then |
| 1758 | IMAGEMAGICK_REQUIRED=1 | 1758 | IMAGEMAGICK_MODULE="Wand" |
| 1759 | IMAGEMAGICK_MODULE="MagickWand >= $IMAGEMAGICK_REQUIRED" | ||
| 1760 | PKG_CHECK_MODULES(IMAGEMAGICK, $IMAGEMAGICK_MODULE, :, :) | 1759 | PKG_CHECK_MODULES(IMAGEMAGICK, $IMAGEMAGICK_MODULE, :, :) |
| 1761 | AC_SUBST(IMAGEMAGICK_CFLAGS) | 1760 | AC_SUBST(IMAGEMAGICK_CFLAGS) |
| 1762 | AC_SUBST(IMAGEMAGICK_LIBS) | 1761 | AC_SUBST(IMAGEMAGICK_LIBS) |