Mercurial > octave

changeset 31407:97057039b835

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Check for symbol removed from ImageMagick++-7 API (bug #63331). * configure.ac (check_magick): Check for additional symbol that was removed from the API of ImageMagick++ version 7.
author Markus Mützel <markus.muetzel@gmx.de>
date Mon, 07 Nov 2022 18:21:23 +0100
parents 658cce403bc7
children 870036573716
files configure.ac
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Sun Nov 06 15:49:58 2022 -0500
+++ b/configure.ac	Mon Nov 07 18:21:23 2022 +0100
@@ -1677,17 +1677,18 @@
     LIBS="$MAGICK_LDFLAGS $MAGICK_LIBS $LIBS"
     AC_LANG_PUSH(C++)
     AC_CHECK_HEADER([Magick++.h], [
-      AC_CACHE_CHECK([for Magick::ColorRGB in Magick++.h],
-        [octave_cv_func_magick_colorrgb],
+      AC_CACHE_CHECK([for Magick::ColorRGB and Magick::PixelPacket in Magick++.h],
+        [octave_cv_func_magick],
         [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
           #include <Magick++.h>
           ]], [[
           Magick::ColorRGB c;
+          Magick::PixelPacket pix;
           ]])],
-          octave_cv_func_magick_colorrgb=yes,
-          octave_cv_func_magick_colorrgb=no)
+          octave_cv_func_magick=yes,
+          octave_cv_func_magick=no)
         ])
-      if test $octave_cv_func_magick_colorrgb = yes; then
+      if test $octave_cv_func_magick = yes; then
         use_magick=yes
         warn_magick=
       fi