Fix confused checks for Image/GraphicsMagick in wscript. Add missing InitializeMagic...

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index cf2eff405114f8bccb48d5a985f5a455a875dd7d..be9d2224503ecbe532f81762461facb7c6868f9d 100644 (file)
--- a/wscript
+++ b/wscript
@@ -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: