Add openjpeg dependency to .pc file.

diff --git a/libdcp-1.0.pc.in b/libdcp-1.0.pc.in
index 3cdda02e663fbf39679540ac092fb1c22b2e386f..a5be1249db1ac227231627c70f9d3b08e5346517 100644 (file)
--- a/libdcp-1.0.pc.in
+++ b/libdcp-1.0.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@
 Name: libdcp
 Description: DCP reading and writing library
 Version: @version@
-Requires: sigc++-2.0 openssl libxml++-2.6 xmlsec1 libasdcp-cth
+Requires: sigc++-2.0 openssl libxml++-2.6 xmlsec1 libasdcp-cth @openjpeg@
 Libs: @libs@
 Cflags: -I${includedir}

diff --git a/wscript b/wscript
index b10aaf28d6c593864c68c91c451cad6cfbeac2af..46a1060b8010ac666e02a046582d34a427afe5a3 100644 (file)
--- a/wscript
+++ b/wscript
@@ -211,7 +211,8 @@ def build(bld):
         version=VERSION,
         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')
+        install_path='${LIBDIR}/pkgconfig',
+        openjpeg='libopenjpeg1' if args.jpeg == 'oj1' else 'libopenjp2')
 
     bld.recurse('src')
     bld.recurse('tools')