configure: fix detection of libopenjpeg
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Tue, 11 Oct 2016 18:28:35 +0000 (20:28 +0200)
committerAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Mon, 17 Oct 2016 15:21:22 +0000 (17:21 +0200)
commit1a43626fdf30ecd348809a1639af896c1c71aba5
treef66a2fece5531d84005c0ad359431b1c244336d1
parent675258764dce6f9f4a6f5fb58c87731714fb964a
configure: fix detection of libopenjpeg

Use check_lib2 to test the header together with the function. This is
necessary, because '-DOPJ_STATIC' changes what the included header does.

Also add '-DOPJ_STATIC' to CPPFLAGS, so that it isn't necessary to
hardcode this in libavcodec/libopenjpeg{dec,enc}.c.

Finally, check for non-static openjpeg 2.1, too.

Reviewed-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit 7a65aef00d113a38e0d1a54df49eead9df6aa15c)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
configure
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c