X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=97f7194ef0eb0f0bb03dae7ecb92f557f61cc472;hb=efdfcbe3103486602cc77f8837c1acfcce4ca0ae;hp=df7fc3cd73f8bfb5a217562b00023b9ded6952f6;hpb=f02b0b7dd767112f13a42dedf98a8e942fd27dc3;p=dcpomatic.git

diff --git a/wscript b/wscript
index df7fc3cd7..97f7194ef 100644
--- a/wscript
+++ b/wscript
@@ -1,19 +1,20 @@
 #
 #    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 #
-#    This program is free software; you can redistribute it and/or modify
+#    This file is part of DCP-o-matic.
+#
+#    DCP-o-matic is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
-#    This program is distributed in the hope that it will be useful,
+#    DCP-o-matic is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 import subprocess
@@ -26,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.8.4devel'
+VERSION = '2.8.5'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -208,6 +209,7 @@ def configure(conf):
                    mandatory=False,
                    msg='Checking for MagickCore namespace',
                    okmsg='yes',
+                   includes=conf.env['INCLUDES_MAGICK'],
                    define_name='DCPOMATIC_HAVE_MAGICKCORE_NAMESPACE')
 
     conf.check_cxx(fragment="""
@@ -218,6 +220,7 @@ def configure(conf):
                    mandatory=False,
                    msg='Checking for MagickLib namespace',
                    okmsg='yes',
+                   includes=conf.env['INCLUDES_MAGICK'],
                    define_name='DCPOMATIC_HAVE_MAGICKLIB_NAMESPACE')
 
     # libzip
@@ -242,6 +245,7 @@ def configure(conf):
                        mandatory=False,
                        msg='Checking for format_stride_for_width',
                        okmsg='yes',
+                       includes=conf.env['INCLUDES_CAIROMM'],
                        define_name='DCPOMATIC_HAVE_FORMAT_STRIDE_FOR_WIDTH')
 
     # libcxml
@@ -297,9 +301,10 @@ def configure(conf):
 
     # libxmlsec
     if conf.options.static_xmlsec:
-        conf.env.STLIB_XMLSEC = ['xmlsec1']
         if conf.check_cxx(lib='xmlsec1-openssl', mandatory=False):
-            conf.env.STLIB_XMLSEC.append('xmlsec1-openssl')
+            conf.env.STLIB_XMLSEC = ['xmlsec1-openssl', 'xmlsec1']
+        else:
+            conf.env.STLIB_XMLSEC = ['xmlsec1']
     else:
         conf.env.LIB_XMLSEC = ['xmlsec1-openssl', 'xmlsec1']