On some systems the library name is not common, now we use the config program to find the right libs to use.
---
configure.ac | 16 ++++++++++++----
m4/wm_imgfmt_check.m4 | 2 +-
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index edc4b77..fa4b897 100644
--- a/configure.ac
+++ b/configure.ac
@@ -322,10 +322,10 @@ dnl ==========
dnl AC_ARG_VAR(PKGCONFIG, [pkg-config command])
AC_CHECK_PROG(PKGCONFIG, pkg-config, pkg-config)
-dnl Magick-config
+dnl MagickWand-config
dnl ==========
-dnl AC_ARG_VAR(MAGICKCONFIG, [Magick-config command])
-AC_CHECK_PROG(MAGICKCONFIG, Magick-config, Magick-config)
+dnl AC_ARG_VAR(MAGICKWCONFIG, [MagickWand-config command])
+AC_CHECK_PROG(MAGICKWCONFIG, MagickWand-config, MagickWand-config)
dnl gettext
dnl =======
@@ -568,7 +568,7 @@ dnl
dnl libMagickWand
dnl
AC_MSG_CHECKING([for libmagickwand header])
-IMFLAGS=`$MAGICKCONFIG --cflags`
+IMFLAGS=`$MAGICKWCONFIG --cflags`
if test "x$IMFLAGS" = "x" ; then
AC_MSG_RESULT([not found])
else
@@ -576,6 +576,14 @@ else
fi
AC_SUBST(IMFLAGS)
+AC_MSG_CHECKING([for libmagickwand library])
+IMLIBS=`$MAGICKWCONFIG --ldflags`
+if test "x$IMLIBS" = "x" ; then
+ AC_MSG_RESULT([not found])
+else
+ AC_MSG_RESULT([found])
+fi
+AC_SUBST(IMLIBS)
dnl Xft2 antialiased font support
dnl =============================
diff --git a/m4/wm_imgfmt_check.m4 b/m4/wm_imgfmt_check.m4
index b5f6eee..00d75fc 100644
--- a/m4/wm_imgfmt_check.m4
+++ b/m4/wm_imgfmt_check.m4
@@ -253,7 +253,7 @@ AC_DEFUN_ONCE([WM_IMGFMT_CHECK_WEBP],
#
# When not found, append info to variable 'unsupported'
AC_DEFUN_ONCE([WM_IMGFMT_CHECK_MAGICK],
-[WM_LIB_CHECK([MAGICK], ["-lMagickWand"], [MagickGetImagePixels],
[$XLFLAGS $XLIBS],
+[WM_LIB_CHECK([MAGICK], ["$IMLIBS"], [MagickGetImagePixels], [$XLFLAGS $XLIBS],
[wm_save_CFLAGS="$CFLAGS $IMFLAGS"
AS_IF([wm_fn_lib_try_compile "wand/magick_wand.h" "" "return 0" ""],
[],
--
1.7.10.4
0001-Better-ImageMagick-lib-detection.patch
Description: Binary data
