Fix up configure checks after Centos hacks.
authorCarl Hetherington <cth@carlh.net>
Mon, 23 May 2016 22:01:35 +0000 (23:01 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 23 May 2016 22:01:35 +0000 (23:01 +0100)
wscript

diff --git a/wscript b/wscript
index df7fc3cd73f8bfb5a217562b00023b9ded6952f6..ae717383dc80b92446262f57e583e2e5dd666d96 100644 (file)
--- a/wscript
+++ b/wscript
@@ -208,6 +208,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 +219,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 +244,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