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:22:01 +0000 (17:22 +0200)
commitada229e66fea11e33a11df2f02dc287304842a48
treebcea92a8bec2660e46749bdd4a83f5deb9a0fdda
parent047e0049d1ccf4e6d62eb22fcc88725e1f43170c
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