fixup! Add openjpeg dependency to .pc file.
authorCarl Hetherington <cth@carlh.net>
Thu, 28 Mar 2024 23:51:00 +0000 (00:51 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 28 Mar 2024 23:51:00 +0000 (00:51 +0100)
wscript

diff --git a/wscript b/wscript
index 46a1060b8010ac666e02a046582d34a427afe5a3..dab35558e890629382b8550681e900204344a5de 100644 (file)
--- a/wscript
+++ b/wscript
@@ -80,6 +80,7 @@ def configure(conf):
     conf.env.DISABLE_EXAMPLES = conf.options.disable_examples
     conf.env.STATIC = conf.options.static
     conf.env.API_VERSION = API_VERSION
+    conf.env.JPEG = conf.options.jpeg
 
     if conf.options.target_windows:
         conf.env.append_value('CXXFLAGS', '-DLIBDCP_WINDOWS')
@@ -212,7 +213,7 @@ def build(bld):
         includedir='%s/include/libdcp%s' % (bld.env.PREFIX, bld.env.API_VERSION),
         libs="-L${libdir} -ldcp%s -lcxml -lboost_system%s" % (bld.env.API_VERSION, boost_lib_suffix),
         install_path='${LIBDIR}/pkgconfig',
-        openjpeg='libopenjpeg1' if args.jpeg == 'oj1' else 'libopenjp2')
+        openjpeg='libopenjpeg1' if bld.env.JPEG == 'oj1' else 'libopenjp2')
 
     bld.recurse('src')
     bld.recurse('tools')