[FFmpeg-cvslog] configure: Support older version of openjpeg1

[Luca Barbato]

ffmpeg | branch: release/2.2 | Luca Barbato <lu_zero at gentoo.org> | Wed Mar 12 09:30:07 2014 +0000| [b920c1d5ad5cfe74c95b0eaec0e69b074ee9b4c1] | committer: Reinhard Tartler

configure: Support older version of openjpeg1

It should work best for debian stable and people not installing the .pc
file.

(cherry picked from commit aa807425395caa17a85ed2833133278e8bd44a76)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b920c1d5ad5cfe74c95b0eaec0e69b074ee9b4c1
---

 configure |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index c6789d5..05acff5 100755
--- a/configure
+++ b/configure
@@ -3938,7 +3938,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