Merge.

diff --cc wscript
index 78b5490d979fd19f371f1eb874ec6b247ae4db47,43ac63548e31b936ae98a0e7248dcc351df6816c..4bcb0bd11681c1cd14e889506205de391859d192
--- 1/wscript
--- 2/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 = """