summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2017-08-08 11:32:47 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-08-08 11:46:35 +0900
commitdb29ee1cd686f4d58f1a13eb8eb0177d5ddd8be8 (patch)
tree383ba3af7b59a129a3168c9b2c439a6ba395ae81 /m4
parentd5ad85abaed3170b86c7915e9ba2ef2e6dae643b (diff)
Evas Jpeg2000 loader: port it to openjpeg 2.*
Test Plan: files in https://github.com/uclouvain/openjpeg-data/tree/master/baseline/nonregression Reviewers: jpeg, raster, cedric Differential Revision: https://phab.enlightenment.org/D5033
Diffstat (limited to 'm4')
-rw-r--r--m4/evas_check_loader.m416
1 files changed, 3 insertions, 13 deletions
diff --git a/m4/evas_check_loader.m4 b/m4/evas_check_loader.m4
index b574931..3ac4d59 100644
--- a/m4/evas_check_loader.m4
+++ b/m4/evas_check_loader.m4
@@ -273,7 +273,7 @@ AC_CHECK_HEADER([openjpeg.h], [have_dep="yes"])
273 273
274if test "x${have_dep}" = "xyes" ; then 274if test "x${have_dep}" = "xyes" ; then
275 AC_CHECK_LIB([openjp2], 275 AC_CHECK_LIB([openjp2],
276 [opj_cio_open], 276 [opj_stream_create],
277 [ 277 [
278 evas_image_loader_[]$1[]_libs="-lopenjp2" 278 evas_image_loader_[]$1[]_libs="-lopenjp2"
279 have_dep="yes" 279 have_dep="yes"
@@ -282,21 +282,11 @@ if test "x${have_dep}" = "xyes" ; then
282fi 282fi
283 283
284if test "x${have_dep}" = "xno" ; then 284if test "x${have_dep}" = "xno" ; then
285 PKG_CHECK_EXISTS([libopenjpeg1 >= 1.5], 285 PKG_CHECK_EXISTS([libopenjp2 >= 2.0],
286 [ 286 [
287 have_dep="yes" 287 have_dep="yes"
288 have_dep_pc="yes" 288 have_dep_pc="yes"
289 requirement="libopenjpeg1 >= 1.5" 289 requirement="libopenjp2 >= 2.0"
290 ],
291 [have_dep="no"])
292fi
293
294if test "x${have_dep}" = "xno" ; then
295 PKG_CHECK_EXISTS([libopenjpeg >= 1.5],
296 [
297 have_dep="yes"
298 have_dep_pc="yes"
299 requirement="libopenjpeg >= 1.5"
300 ], 290 ],
301 [have_dep="no"]) 291 [have_dep="no"])
302fi 292fi