diff options
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 18 |
1 files changed, 5 insertions, 13 deletions
@@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.06pre' +VERSION = '1.07pre' def options(opt): opt.load('compiler_cxx') @@ -86,7 +86,7 @@ def configure(conf): # Dependencies which are dynamically linked everywhere except --static # Get libs only when we are dynamically linking - conf.check_cfg(package='libdcp', atleast_version='0.78', args=pkg_config_args(conf), uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp', atleast_version='0.81', args=pkg_config_args(conf), uselib_store='DCP', mandatory=True) # Remove erroneous escaping of quotes from xmlsec1 defines conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] conf.check_cfg(package='libcxml', atleast_version='0.01', args=pkg_config_args(conf), uselib_store='CXML', mandatory=True) @@ -126,9 +126,9 @@ def configure(conf): int main(void) { quickmail_initialize (); } """, mandatory=True, - msg='Checking for quickmail', + msg='Checking for libquickmail', libpath='/usr/local/lib', - lib='quickmail', + lib=['quickmail', 'curl'], uselib_store='QUICKMAIL') # Dependencies which are always dynamically linked @@ -137,15 +137,7 @@ def configure(conf): conf.check_cfg(package= '', path=conf.options.magickpp_config, args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=True) conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='XML++', mandatory=True) conf.check_cfg(package='libcurl', args='--cflags --libs', uselib_store='CURL', mandatory=True) - - conf.check_cxx(fragment=""" - #include <zip.h> - int main(void) { zip_open ("foo", 0, 0); } - """, - mandatory=True, - msg='Checking for libzip', - lib='zip', - uselib_store='ZIP') + conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True) conf.check_cxx(fragment=""" #include <boost/version.hpp>\n |