aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2014-03-12 09:30:07 +0000
committerVittorio Giovara <vittorio.giovara@gmail.com>2014-03-12 14:06:21 +0100
commitaa807425395caa17a85ed2833133278e8bd44a76 (patch)
tree3e0879dbbcfe798145fe119b94e3bba8c884d3f3
parentb4e355c89e23664b8dac26936bf3fa7e7bc2110f (diff)
downloadffmpeg-aa807425395caa17a85ed2833133278e8bd44a76.tar.gz
configure: Support older version of openjpeg1
It should work best for debian stable and people not installing the .pc file.
-rwxr-xr-xconfigure3
1 files changed, 2 insertions, 1 deletions
diff --git a/configure b/configure
index 01d3323227..dabb999c80 100755
--- a/configure
+++ b/configure
@@ -3982,7 +3982,8 @@ enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set
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/cv.h cvCreateImageHeader
-enabled libopenjpeg && require_pkg_config libopenjpeg1 openjpeg.h opj_version
+enabled libopenjpeg && { { check_header openjpeg.h && check_lib2 openjpeg.h opj_version -lopenjpeg; } ||
+ { require_pkg_config libopenjpeg1 openjpeg.h opj_version; } }
enabled libopus && require_pkg_config opus opus_multistream.h opus_multistream_decoder_create
enabled libpulse && require_pkg_config libpulse-simple pulse/simple.h pa_simple_new
enabled librtmp && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket