X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=fd9d47e7931169c754c32a2d27ef105279b95c87;hb=fc39cebbc4d20238a4b751724ea32105bdd61286;hp=48095917911eb652e93521d42af92925e49c463c;hpb=16f43a2c953b80098a6db4b14a9d9d9f284c0dcd;p=dcpomatic.git

diff --git a/wscript b/wscript
index 480959179..fd9d47e79 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.8.13'
+VERSION = '2.8.14devel'
 
 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: