From 09bbed8ab16fdb016b7cc19da3db5858ffc3a5b7 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Wed, 3 Jul 2024 22:58:55 +0000 Subject: [PATCH] configure: Check for and use new ImageMagick 7 "magick" command --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 326b1fbdda..431fe59f4c 100644 --- a/configure.ac +++ b/configure.ac @@ -619,13 +619,13 @@ AC_ARG_WITH([daemon], can_render_icons=yes AC_PATH_PROGS([RSVG_CONVERT],[rsvg-convert rsvg],no) -AC_PATH_PROGS([IMAGEMAGICK_CONVERT],[convert],no) +AC_PATH_PROGS([IMAGEMAGICK_CONVERT],[magick convert],no) AC_PATH_PROGS([PNG2ICNS],[png2icns],no) if test x$RSVG_CONVERT = xno; then can_render_icons='rsvg-convert' elif test x$IMAGEMAGICK_CONVERT = xno; then - can_render_icons='(ImageMagick) convert' + can_render_icons='ImageMagick' fi case $host in @@ -683,7 +683,7 @@ case $host in AX_CHECK_COMPILE_FLAG([-Wa,-muse-unaligned-vector-move], [CORE_CXXFLAGS="$CORE_CXXFLAGS -Wa,-muse-unaligned-vector-move"], [], [$CXXFLAG_WERROR]) AC_PATH_PROGS([RSVG_CONVERT], [rsvg-convert rsvg],rsvg-convert) - AC_PATH_PROGS([IMAGEMAGICK_CONVERT], [convert],convert) + AC_PATH_PROGS([IMAGEMAGICK_CONVERT], [magick convert],convert) ;; *darwin*) if test x$PNG2ICNS = xno; then