summaryrefslogtreecommitdiff
path: root/wscript
diff options
context:
space:
mode:
authorCarl Hetherington <carl@vertual.co.uk>2013-01-23 16:37:13 +0000
committerCarl Hetherington <carl@vertual.co.uk>2013-01-23 16:37:13 +0000
commitdcdd532760f8970505b7fa5c83f86fbe39a73148 (patch)
treeaf888f18fb13fcc766e3fd46dcb62d08ed19171a /wscript
parentd714233760a8f6a0541c279c3046984f2d199814 (diff)
Use pkg-config for libopenjpeg when it is being linked dynamically.
Diffstat (limited to 'wscript')
-rw-r--r--wscript11
1 files changed, 1 insertions, 10 deletions
diff --git a/wscript b/wscript
index 7412271e..a0734d09 100644
--- a/wscript
+++ b/wscript
@@ -29,19 +29,10 @@ def configure(conf):
conf.check_cfg(package = 'openssl', args = '--cflags --libs', uselib_store = 'OPENSSL', mandatory = True)
conf.check_cfg(package = 'libxml++-2.6', args = '--cflags --libs', uselib_store = 'LIBXML++', mandatory = True)
-
- openjpeg_fragment = """
- #include <stdio.h>\n
- #include <openjpeg.h>\n
- int main () {\n
- void* p = (void *) opj_image_create;\n
- return 0;\n
- }
- """
if conf.options.static_openjpeg:
conf.check_cc(fragment = openjpeg_fragment, msg = 'Checking for library openjpeg', stlib = 'openjpeg', uselib_store = 'OPENJPEG')
else:
- conf.check_cc(fragment = openjpeg_fragment, msg = 'Checking for library openjpeg', lib = 'openjpeg', uselib_store = 'OPENJPEG')
+ conf.check_cfg(package = 'libopenjpeg', args = '--cflags --libs', uselib_store = 'OPENJPEG', mandatory = True)
if conf.options.target_windows:
boost_lib_suffix = '-mt'