Skip to content

Commit 09bbed8

Browse files
committed
configure: Check for and use new ImageMagick 7 "magick" command
1 parent e54a3c8 commit 09bbed8

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

configure.ac

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -619,13 +619,13 @@ AC_ARG_WITH([daemon],
619619

620620
can_render_icons=yes
621621
AC_PATH_PROGS([RSVG_CONVERT],[rsvg-convert rsvg],no)
622-
AC_PATH_PROGS([IMAGEMAGICK_CONVERT],[convert],no)
622+
AC_PATH_PROGS([IMAGEMAGICK_CONVERT],[magick convert],no)
623623
AC_PATH_PROGS([PNG2ICNS],[png2icns],no)
624624

625625
if test x$RSVG_CONVERT = xno; then
626626
can_render_icons='rsvg-convert'
627627
elif test x$IMAGEMAGICK_CONVERT = xno; then
628-
can_render_icons='(ImageMagick) convert'
628+
can_render_icons='ImageMagick'
629629
fi
630630

631631
case $host in
@@ -683,7 +683,7 @@ case $host in
683683
AX_CHECK_COMPILE_FLAG([-Wa,-muse-unaligned-vector-move], [CORE_CXXFLAGS="$CORE_CXXFLAGS -Wa,-muse-unaligned-vector-move"], [], [$CXXFLAG_WERROR])
684684

685685
AC_PATH_PROGS([RSVG_CONVERT], [rsvg-convert rsvg],rsvg-convert)
686-
AC_PATH_PROGS([IMAGEMAGICK_CONVERT], [convert],convert)
686+
AC_PATH_PROGS([IMAGEMAGICK_CONVERT], [magick convert],convert)
687687
;;
688688
*darwin*)
689689
if test x$PNG2ICNS = xno; then

0 commit comments

Comments
 (0)