summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2014-09-25 22:35:39 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2014-09-26 00:06:41 +0200
commit475e3799cdcc90a38f9bbc4c6b9159a028b1ad44 (patch)
tree28ded971b0c72350fa279b949b9e1dc8e6af7eba /configure
parent8de7bdd756b6a14d92dc48c34d3190d6a806934a (diff)
Support libopenjpeg 2.x via libopenmj2.
Based on a patch by Marius Cirsta. Fixes ticket #2016.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure3
1 files changed, 2 insertions, 1 deletions
diff --git a/configure b/configure
index 53a1e38f95..28c735e035 100755
--- a/configure
+++ b/configure
@@ -4837,7 +4837,8 @@ enabled libnut && require libnut libnut.h nut_demuxer_init -lnut
enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
enabled libopencv && require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader
-enabled libopenjpeg && { check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC ||
+enabled libopenjpeg && { check_lib openjpeg.h opj_version -lopenmj2 -DOPJ_STATIC ||
+ check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC ||
check_lib openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC ||
die "ERROR: libopenjpeg not found"; }
enabled libopus && require_pkg_config opus opus_multistream.h opus_multistream_decoder_create