From 31dc0588343294f79bd24fe7558fe37ae469f9df Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Tue, 10 Jan 2023 01:46:00 +0100
Subject: 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.
---
 configure.ac | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'configure.ac')

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)
-- 
cgit v1.2.1