X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=bcda8d74d5d4d87d3a55e7c82726e4511f9470ba;hb=6028b10bcb0579ca702c5e7a1140ba3e58681d01;hp=6b77d05084f32e2f44a77f7bb78aaf5c9ae9d82b;hpb=e2d49381d110a8b75628b28e92f9c2118266c88f;p=dcpomatic.git diff --git a/wscript b/wscript index 6b77d0508..bcda8d74d 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.06' +VERSION = '1.15pre' def options(opt): opt.load('compiler_cxx') @@ -128,7 +128,7 @@ def configure(conf): mandatory=True, 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 - 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 \n