X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=fd9d47e7931169c754c32a2d27ef105279b95c87;hb=2894023433c3addfb04ba7ae0be534e251b641b9;hp=cb4e45f84dfdbf314c8f2fca3eea8c842a606f6d;hpb=283205f4bff717d0f70b5a4464df4ebd3581a51b;p=dcpomatic.git

diff --git a/wscript b/wscript
index cb4e45f84..fd9d47e79 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.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:
@@ -309,7 +311,7 @@ def configure(conf):
         conf.env.LIB_XMLSEC = ['xmlsec1-openssl', 'xmlsec1']
 
     # nettle
-    config.check_cfg(package="nettle", args='--cflags --libs', uselib_store='NETTLE', mandatory=True)
+    conf.check_cfg(package="nettle", args='--cflags --libs', uselib_store='NETTLE', mandatory=True)
 
     # FFmpeg
     if conf.options.static_ffmpeg: