diff options
| author | Robert Scheck <[email protected]> | 2023-01-10 01:46:00 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2023-04-06 20:09:23 +0200 |
| commit | 31dc0588343294f79bd24fe7558fe37ae469f9df (patch) | |
| tree | 1d661ad366bb85e64358639a5a5c6e52b4131640 | |
| parent | 8b7333ee23775df9c1dce27230f76b3cb6eb4855 (diff) | |
| download | eom-31dc0588343294f79bd24fe7558fe37ae469f9df.tar.bz2 eom-31dc0588343294f79bd24fe7558fe37ae469f9df.tar.xz | |
Fix building with ImageMagick 7
Check for ImageMagick 7 first, then for ImageMagick 6. Original (the
reversed) ordering might lead accidentially to HAVE_IMAGEMAGICK6 with
ImageMagick 7.
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index ee006be..60cc4d0 100644 --- a/configure.ac +++ b/configure.ac @@ -318,17 +318,17 @@ if test "x$enable_thumbnailer" != "xno"; then CPPFLAGS_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $MAGICK_CFLAGS" - AC_CHECK_HEADER([wand/MagickWand.h], - [have_im6="yes"], - [AC_CHECK_HEADER([MagickWand/MagickWand.h], [have_im7="yes"])]) + AC_CHECK_HEADER([MagickWand/MagickWand.h], + [have_im7="yes"], + [AC_CHECK_HEADER([wand/MagickWand.h], [have_im6="yes"])]) CPPFLAGS="$CPPFLAGS_save" - if test "x$have_im6" = "xyes"; then - AC_DEFINE(HAVE_IMAGEMAGICK6,1, [Have ImageMagick 6]) - fi if test "x$have_im7" = "xyes"; then AC_DEFINE(HAVE_IMAGEMAGICK7,1, [Have ImageMagick 7]) fi + if test "x$have_im6" = "xyes"; then + AC_DEFINE(HAVE_IMAGEMAGICK6,1, [Have ImageMagick 6]) + fi THUMBNAILER_CFLAGS="$CFLAGS $GLIB_CFLAGS $GIO_CFLAGS $MAGICK_CFLAGS" AC_SUBST(THUMBNAILER_CFLAGS) |