From 1dace5699fe9e565ca36ffc19688effd2f496d08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig-=C3=98rjan=20Smelror?= Date: Tue, 12 Feb 2019 17:43:18 +0100 Subject: [PATCH] Drop support for Imagemagick version < 7 Had to do a few modifications to get WM to build with Imagemagick 7. Attached is the diff from the latest git checkout. Cheers, Stig --- m4/wm_imgfmt_check.m4 | 2 +- wrlib/load_magick.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/m4/wm_imgfmt_check.m4 b/m4/wm_imgfmt_check.m4 index c5e3b6ac..b5adf6f4 100644 --- a/m4/wm_imgfmt_check.m4 +++ b/m4/wm_imgfmt_check.m4 @@ -312,7 +312,7 @@ AS_IF([test "x$enable_magick" = "xno"], dnl dnl The library was found, check if header is available and compiles wm_save_CFLAGS="$CFLAGS" - AS_IF([wm_fn_lib_try_compile "wand/magick_wand.h" "MagickWand *wand;" "wand = NewMagickWand()" "$wm_cv_libchk_magick_cflags"], + AS_IF([wm_fn_lib_try_compile "MagickWand/MagickWand.h" "MagickWand *wand;" "wand = NewMagickWand()" "$wm_cv_libchk_magick_cflags"], [wm_cv_libchk_magick="$wm_cv_libchk_magick_cflags % $wm_cv_libchk_magick_libs"], [AC_MSG_ERROR([found MagickWand library but could not compile its header])]) CFLAGS="$wm_save_CFLAGS"])dnl diff --git a/wrlib/load_magick.c b/wrlib/load_magick.c index 3e809ba2..1edbebc3 100644 --- a/wrlib/load_magick.c +++ b/wrlib/load_magick.c @@ -22,7 +22,7 @@ #include "config.h" -#include +#include #include "wraster.h" #include "imgformat.h"