[SCM] libav/master: configure: Support older version of openjpeg1

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ce364088ef53dbaf90e74a471d12b732b697e0cd
Author: Luca Barbato <lu_zero at gentoo.org>
Date:   Wed Mar 12 09:30:07 2014 +0000

    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)
    
    Conflicts:
    	configure
    
    Signed-off-by: Anton Khirnov <anton at khirnov.net>

diff --git a/configure b/configure
index 362d788..466ce54 100755
--- a/configure
+++ b/configure
@@ -3499,7 +3499,8 @@ enabled libmp3lame && require  "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_q
 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

-- 
Libav/FFmpeg packaging