Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-05-13 03:30:42 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

configure: Check for and use new ImageMagick 7 "magick" command

Browse Source
This commit is contained in:
Luke Dashjr 2024-07-03 22:58:55 +00:00
parent e54a3c8332
commit 09bbed8ab1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -619,13 +619,13 @@ AC_ARG_WITH([daemon],
can_render_icons=yes can_render_icons=yes
AC_PATH_PROGS([RSVG_CONVERT],[rsvg-convert rsvg],no) 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) AC_PATH_PROGS([PNG2ICNS],[png2icns],no)
if test x$RSVG_CONVERT = xno; then if test x$RSVG_CONVERT = xno; then
can_render_icons='rsvg-convert' can_render_icons='rsvg-convert'
elif test x$IMAGEMAGICK_CONVERT = xno; then elif test x$IMAGEMAGICK_CONVERT = xno; then
can_render_icons='(ImageMagick) convert' can_render_icons='ImageMagick'
fi fi
case $host in 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]) 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([RSVG_CONVERT], [rsvg-convert rsvg],rsvg-convert)
AC_PATH_PROGS([IMAGEMAGICK_CONVERT], [convert],convert) AC_PATH_PROGS([IMAGEMAGICK_CONVERT], [magick convert],convert)
;; ;;
*darwin*) *darwin*)
if test x$PNG2ICNS = xno; then if test x$PNG2ICNS = xno; then