X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=bcda8d74d5d4d87d3a55e7c82726e4511f9470ba;hb=6028b10bcb0579ca702c5e7a1140ba3e58681d01;hp=2e6d8740f8eb608458807f3b193ab7d36cc7e7aa;hpb=63155a20333ec1131e8b0f0882531861ae5380e7;p=dcpomatic.git

diff --git a/wscript b/wscript
index 2e6d8740f..bcda8d74d 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.05pre'
+VERSION = '1.15pre'
 
 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)
@@ -119,12 +119,25 @@ def configure(conf):
         conf.env.STLIB_POSTPROC   = ['postproc']
         conf.env.STLIB_SWRESAMPLE = ['swresample']
         conf.env.STLIB_OPENJPEG   = ['openjpeg']
+        conf.env.STLIB_QUICKMAIL  = ['quickmail']
+    else:
+        conf.check_cxx(fragment="""
+                            #include <quickmail.h>
+                            int main(void) { quickmail_initialize (); }
+                            """,
+                       mandatory=True,
+                       msg='Checking for libquickmail',
+                       libpath='/usr/local/lib',
+                       lib=['quickmail', 'curl'],
+                       uselib_store='QUICKMAIL')
 
     # Dependencies which are always dynamically linked
     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= '', 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_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True)
 
     conf.check_cxx(fragment="""
                             #include <boost/version.hpp>\n