X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=f10c31d5898b819c42023ee0d3ae7fda70561d20;hb=9f116a9a089ae09826e157a564b02970e823fefc;hp=39861cf8ec4c949b111e9bfae5ab281f1c88d529;hpb=834d90fb192c45ac716b8be42d62d334de848681;p=dcpomatic.git diff --git a/wscript b/wscript index 39861cf8e..f10c31d58 100644 --- a/wscript +++ b/wscript @@ -27,7 +27,7 @@ import distutils.spawn from waflib import Logs, Context APPNAME = 'dcpomatic' -VERSION = '2.8.9devel' +VERSION = '2.8.16devel' def options(opt): opt.load('compiler_cxx') @@ -192,7 +192,9 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_IMAGE_MAGICK') else: image = conf.check_cfg(package='ImageMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False) - graphics = conf.check_cfg(package='GraphicsMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False) + graphics = None + if image is None: + graphics = conf.check_cfg(package='GraphicsMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False) if image is None and graphics is None: Logs.pprint('RED', 'Neither ImageMagick++ nor GraphicsMagick++ found: one or the other is required') if image is not None: