From: Christophe CURIS <[email protected]>
---
configure.ac | 12 ++++++------
m4/wm_imgfmt_check.m4 | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index 3d42c61..f077da5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -568,22 +568,22 @@ dnl
dnl libMagickWand
dnl
AC_MSG_CHECKING([for libmagickwand header])
-IMFLAGS=`$MAGICKWCONFIG --cflags`
-if test "x$IMFLAGS" = "x" ; then
+MAGICKFLAGS=`$MAGICKWCONFIG --cflags`
+if test "x$MAGICKFLAGS" = "x" ; then
AC_MSG_RESULT([not found])
else
AC_MSG_RESULT([found])
fi
-AC_SUBST(IMFLAGS)
+AC_SUBST(MAGICKFLAGS)
AC_MSG_CHECKING([for libmagickwand library])
-IMLIBS=`$MAGICKWCONFIG --ldflags`
-if test "x$IMLIBS" = "x" ; then
+MAGICKLIBS=`$MAGICKWCONFIG --ldflags`
+if test "x$MAGICKLIBS" = "x" ; then
AC_MSG_RESULT([not found])
else
AC_MSG_RESULT([found])
fi
-AC_SUBST(IMLIBS)
+AC_SUBST(MAGICKLIBS)
dnl Xft2 antialiased font support
dnl =============================
diff --git a/m4/wm_imgfmt_check.m4 b/m4/wm_imgfmt_check.m4
index af43f71..2bf9e74 100644
--- a/m4/wm_imgfmt_check.m4
+++ b/m4/wm_imgfmt_check.m4
@@ -259,8 +259,8 @@ AM_CONDITIONAL([USE_XPM], [test "x$enable_xpm" != "xno"])dnl
# and MAGICKLIBS, and append info to the variable 'supported_gfx'
# When not found, append info to variable 'unsupported'
AC_DEFUN_ONCE([WM_IMGFMT_CHECK_MAGICK],
-[WM_LIB_CHECK([MAGICK], ["$IMLIBS"], [MagickGetImagePixels], [$XLFLAGS $XLIBS],
- [wm_save_CFLAGS="$CFLAGS $IMFLAGS"
+[WM_LIB_CHECK([MAGICK], ["$MAGICKLIBS"], [MagickGetImagePixels], [$XLFLAGS
$XLIBS],
+ [wm_save_CFLAGS="$CFLAGS $MAGICKLIBS"
AS_IF([wm_fn_lib_try_compile "wand/magick_wand.h" "" "return 0" ""],
[],
[AC_MSG_ERROR([found $CACHEVAR but could not find appropriate header
- are you missing libmagickwand package?])])
--
1.9.2
--
To unsubscribe, send mail to [email protected].
