diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-12-18 00:38:23 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-12-18 00:38:23 +0000 |
| commit | 5d0ac178744ea1636a2dfefd2f743f320526ca60 (patch) | |
| tree | 4e554f726174d4f410e6abe23567484cf2dca42e | |
| parent | b8883efc8d891ec634ba5587c2d3ca02c71b7cce (diff) | |
Try to fix build failure with ImageMagick 7 on arch.
| -rw-r--r-- | src/lib/environment_info.cc | 6 | ||||
| -rw-r--r-- | wscript | 23 |
2 files changed, 29 insertions, 0 deletions
diff --git a/src/lib/environment_info.cc b/src/lib/environment_info.cc index 7d8603697..5e9a255cd 100644 --- a/src/lib/environment_info.cc +++ b/src/lib/environment_info.cc @@ -25,8 +25,14 @@ #include <dcp/version.h> #include <libssh/libssh.h> #ifdef DCPOMATIC_IMAGE_MAGICK +/* ImageMagick */ +#ifdef DCPOMATIC_MAGICKCORE_MAGICK #include <magick/MagickCore.h> #else +#include <MagickCore/MagickCore.h> +#endif +#else +/* GraphicsMagick */ #include <magick/common.h> #include <magick/magick_config.h> #endif @@ -233,6 +233,29 @@ def configure(conf): includes=conf.env['INCLUDES_MAGICK'], define_name='DCPOMATIC_HAVE_MAGICKLIB_NAMESPACE') + # See where MagickCore.h is + conf.check_cxx(fragment=""" + #include <magick/MagickCore.h>\n + int main() { return 0; }\n + """, + mandatory=False, + msg='Checking for MagickCore.h location', + okmsg='magick', + errmsg='not magick', + includes=conf.env['INCLUDES_MAGICK'], + define_name='DCPOMATIC_MAGICKCORE_MAGICK') + + conf.check_cxx(fragment=""" + #include <MagickCore/MagickCore.h>\n + int main() { return 0; }\n + """, + mandatory=False, + msg='Checking for MagickCore.h location', + okmsg='MagickCore', + errmsg='not MagickCore', + includes=conf.env['INCLUDES_MAGICK'], + define_name='DCPOMATIC_MAGICKCORE_MAGICKCORE') + # libzip conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True) |