Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic

diff --combined wscript
index f5d1a1c3438722c28e3f419cca09da78d195e6b2,786ff42871d01af6a793dbb064566079ed26aef4..efbf69eaa33e19403235f9efc9266da064d29bbe
--- 1/wscript
--- 2/wscript
+++ b/wscript
@@@ -1,11 -1,9 +1,11 @@@
  import subprocess
  import os
  import sys
 +import distutils
 +import distutils.spawn
  
  APPNAME = 'dcpomatic'
- VERSION = '1.75.1devel'
+ VERSION = '1.75.2devel'
  
  def options(opt):
      opt.load('compiler_cxx')
@@@ -324,13 -322,7 +324,13 @@@ def configure(conf)
      # Dependencies which are always dynamically linked
      conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=True)
      conf.check_cfg(package='glib-2.0', args='--cflags --libs', uselib_store='GLIB', mandatory=True)
 -    conf.check_cfg(package= '', path=conf.options.magickpp_config, args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=True)
 +    if distutils.spawn.find_executable(conf.options.magickpp_config):
 +        conf.check_cfg(package='', path=conf.options.magickpp_config, args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=True)
 +        conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_IMAGE_MAGICK')
 +    else:
 +        conf.check_cfg(package='GraphicsMagick++', args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=True)
 +        conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_GRAPHICS_MAGICK')
 +        
      conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True)
  
      conf.check_cc(fragment="""