Merge.

diff --combined wscript
index 78b5490d979fd19f371f1eb874ec6b247ae4db47,43ac63548e31b936ae98a0e7248dcc351df6816c..4bcb0bd11681c1cd14e889506205de391859d192
--- 1/wscript
--- 2/wscript
+++ b/wscript
@@@ -13,6 -13,8 +13,8 @@@ def options(opt)
      opt.add_option('--disable-gui', action='store_true', default = False, help = 'disable building of GUI tools')
      opt.add_option('--target-windows', action='store_true', default = False, help = 'set up to do a cross-compile to Windows')
      opt.add_option('--static', action='store_true', default = False, help = 'build statically, and link statically to libdcp and FFmpeg')
+     opt.add_option('--magickpp-config', action='store', default='Magick++-config', help = 'path to Magick++-config')
+     opt.add_option('--wx-config', action='store', default='wx-config', help = 'path to wx-config')
  
  def configure(conf):
      conf.load('compiler_cxx')
@@@ -50,7 -52,7 +52,7 @@@
          conf.env.append_value('CXXFLAGS', '-O2')
  
      if not conf.options.static:
 -        conf.check_cfg(package = 'libdcp', atleast_version = '0.36', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True)
 +        conf.check_cfg(package = 'libdcp', atleast_version = '0.39', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True)
          conf.check_cfg(package = 'libavformat', args = '--cflags --libs', uselib_store = 'AVFORMAT', mandatory = True)
          conf.check_cfg(package = 'libavfilter', args = '--cflags --libs', uselib_store = 'AVFILTER', mandatory = True)
          conf.check_cfg(package = 'libavcodec', args = '--cflags --libs', uselib_store = 'AVCODEC', mandatory = True)
@@@ -73,7 -75,7 +75,7 @@@
          conf.env.STLIB_AVFILTER = ['avfilter', 'swresample']
          conf.env.HAVE_AVCODEC = 1
          conf.env.STLIB_AVCODEC = ['avcodec']
-         conf.env.LIB_AVCODEC = ['x264', 'z']
+         conf.env.LIB_AVCODEC = ['z']
          conf.env.HAVE_AVUTIL = 1
          conf.env.STLIB_AVUTIL = ['avutil']
          conf.env.HAVE_SWSCALE = 1
@@@ -89,9 -91,8 +91,9 @@@
  
      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 = """
@@@ -107,18 -108,6 +109,18 @@@
          conf.check_cfg(package = 'libopenjpeg', args = '--cflags --libs', atleast_version = '1.5.0', uselib_store = 'OPENJPEG', mandatory = True)
          conf.check_cfg(package = 'libopenjpeg', args = '--cflags --libs', max_version = '1.5.1', mandatory = True)
  
 +    conf.check_cxx(fragment = """
 +                              #include <boost/version.hpp>\n
 +                              #if BOOST_VERSION < 104500\n
 +                              #error boost too old\n
 +                              #endif\n
 +                              int main(void) { return 0; }\n
 +                              """,
 +                   mandatory = True,
 +                   msg = 'Checking for boost library >= 1.45',
 +                   okmsg = 'yes',
 +                   errmsg = 'too old\nPlease install boost version 1.45 or higher.')
 +
      conf.check_cc(fragment  = """
                                #include <libssh/libssh.h>\n
                                int main () {\n
@@@ -131,7 -120,6 +133,7 @@@
                              #include <boost/thread.hpp>\n
                              int main() { boost::thread t (); }\n
                              """, msg = 'Checking for boost threading library',
 +                            libpath = '/usr/local/lib',
                                lib = [boost_thread, 'boost_system%s' % boost_lib_suffix],
                                uselib_store = 'BOOST_THREAD')