From: Carl Hetherington <cth@carlh.net>
Date: Thu, 7 Feb 2013 00:02:15 +0000 (+0000)
Subject: Merge.
X-Git-Tag: v2.0.48~1337^2~705
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=32fc1ddb0ee004d18c36155ddcf4d9b3998a7061

Merge.
---

32fc1ddb0ee004d18c36155ddcf4d9b3998a7061
diff --cc wscript
index 78b5490d9,43ac63548..4bcb0bd11
--- a/wscript
+++ b/wscript
@@@ -89,9 -91,8 +91,9 @@@ def configure(conf)
  
      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 = 'liblzma', args = '--cflags --libs', uselib_store = 'LZMA', mandatory = True)
 +    if conf.options.target_windows is False:
 +        conf.check_cfg(package = 'liblzma', args = '--cflags --libs', uselib_store = 'LZMA', mandatory = True)
-     conf.check_cfg(package = '', path = 'Magick++-config', args = '--cppflags --cxxflags --libs', uselib_store = 'MAGICK', mandatory = True)
+     conf.check_cfg(package = '', path = conf.options.magickpp_config, args = '--cppflags --cxxflags --libs', uselib_store = 'MAGICK', mandatory = True)
  
      if conf.options.static:
          conf.check_cc(fragment = """