From a4cece4b93b483d72d8c9390f8bf83dd6b88716b Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 5 Jul 2022 22:55:25 +0300 Subject: [PATCH 56/56] Fix detection of cross-MagickWand-config See osdn #45009 Signed-off-by: Marko Lindqvist --- m4/magickwand.m4 | 4 ++-- m4/mapimg-magickwand.m4 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/m4/magickwand.m4 b/m4/magickwand.m4 index 139f373981..e16a91c22c 100644 --- a/m4/magickwand.m4 +++ b/m4/magickwand.m4 @@ -17,7 +17,7 @@ AC_DEFUN([FC_CHECK_MAGICKWAND], for i in /usr/local /usr; do - test -r $i/bin/${host}-MagicWand-config && + test -r $i/bin/${host}-MagickWand-config && WAND_CONFIG_PATH=$i/bin && WAND_CONFIG_NAME=${host}-MagickWand-config && break done @@ -71,7 +71,7 @@ AC_DEFUN([FC_CHECK_MAGICKWAND], LIBS="$WAND_LIBS $LIBS" AC_MSG_CHECKING([for all development tools needed for MagickWand]) - dnl First look for MagicWand-7 + dnl First look for MagickWand-7 AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [MagickWand *mw = NewMagickWand();])], [AC_MSG_RESULT([yes]) diff --git a/m4/mapimg-magickwand.m4 b/m4/mapimg-magickwand.m4 index 1fca52cc14..568d814292 100644 --- a/m4/mapimg-magickwand.m4 +++ b/m4/mapimg-magickwand.m4 @@ -16,7 +16,7 @@ AC_DEFUN([FC_MAPIMG_MAGICKWAND], AC_SUBST(MAPIMG_WAND_CFLAGS) AC_SUBST(MAPIMG_WAND_LIBS) - AC_DEFINE([HAVE_MAPIMG_MAGICKWAND], [1], [Have magicwand mapimg toolkit]) + AC_DEFINE([HAVE_MAPIMG_MAGICKWAND], [1], [Have magickwand mapimg toolkit]) mapimg_magickwand=yes ], [ -- 2.35.1