diff options
author | Vincent Torri <vincent.torri@gmail.com> | 2017-08-09 16:43:11 +0900 |
---|---|---|
committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2017-08-09 16:45:24 +0900 |
commit | d29f9e700eed1d817d4c0473db214154c988b715 (patch) | |
tree | 664a2fa7419c024052eac5fce5f5b31fd21628ae /m4 | |
parent | 89aeb2b682c74dee53ea88343243e9d82812bb55 (diff) |
Fix recent openjpeg detection for Jpeg2000 on Debian
Diffstat (limited to 'm4')
-rw-r--r-- | m4/evas_check_loader.m4 | 38 |
1 files changed, 10 insertions, 28 deletions
diff --git a/m4/evas_check_loader.m4 b/m4/evas_check_loader.m4 index 3ac4d5901e..ff48c3c388 100644 --- a/m4/evas_check_loader.m4 +++ b/m4/evas_check_loader.m4 | |||
@@ -264,44 +264,26 @@ dnl use: EVAS_CHECK_LOADER_DEP_JP2K(loader, want_static[, ACTION-IF-FOUND[, ACTI | |||
264 | AC_DEFUN([EVAS_CHECK_LOADER_DEP_JP2K], | 264 | AC_DEFUN([EVAS_CHECK_LOADER_DEP_JP2K], |
265 | [ | 265 | [ |
266 | 266 | ||
267 | requirement="" | ||
267 | have_dep="no" | 268 | have_dep="no" |
268 | have_dep_pc="no" | ||
269 | evas_image_loader_[]$1[]_cflags="" | 269 | evas_image_loader_[]$1[]_cflags="" |
270 | evas_image_loader_[]$1[]_libs="" | 270 | evas_image_loader_[]$1[]_libs="" |
271 | 271 | ||
272 | AC_CHECK_HEADER([openjpeg.h], [have_dep="yes"]) | 272 | PKG_CHECK_EXISTS([libopenjp2 >= 2.0], |
273 | 273 | [ | |
274 | if test "x${have_dep}" = "xyes" ; then | 274 | have_dep="yes" |
275 | AC_CHECK_LIB([openjp2], | 275 | requirement="libopenjp2 >= 2.0" |
276 | [opj_stream_create], | 276 | ], |
277 | [ | 277 | [have_dep="no"]) |
278 | evas_image_loader_[]$1[]_libs="-lopenjp2" | ||
279 | have_dep="yes" | ||
280 | ], | ||
281 | [have_dep="no"]) | ||
282 | fi | ||
283 | |||
284 | if test "x${have_dep}" = "xno" ; then | ||
285 | PKG_CHECK_EXISTS([libopenjp2 >= 2.0], | ||
286 | [ | ||
287 | have_dep="yes" | ||
288 | have_dep_pc="yes" | ||
289 | requirement="libopenjp2 >= 2.0" | ||
290 | ], | ||
291 | [have_dep="no"]) | ||
292 | fi | ||
293 | 278 | ||
294 | if test "x${have_dep}" = "xyes" ; then | 279 | if test "x${have_dep}" = "xyes" ; then |
295 | if test "x$2" = "xstatic" ; then | 280 | if test "x$2" = "xstatic" ; then |
296 | requirements_pc_evas="${requirement} ${requirements_pc_evas}" | 281 | requirements_pc_evas="${requirement} ${requirements_pc_evas}" |
297 | requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}" | 282 | requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}" |
298 | requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}" | ||
299 | fi | ||
300 | if test "x${have_dep_pc}" = "xyes" ; then | ||
301 | PKG_CHECK_MODULES([JP2K], [${requirement}]) | ||
302 | evas_image_loader_[]$1[]_cflags="${JP2K_CFLAGS}" | ||
303 | evas_image_loader_[]$1[]_libs="${JP2K_LIBS}" | ||
304 | fi | 283 | fi |
284 | PKG_CHECK_MODULES([JP2K], [${requirement}]) | ||
285 | evas_image_loader_[]$1[]_cflags="${JP2K_CFLAGS}" | ||
286 | evas_image_loader_[]$1[]_libs="${JP2K_LIBS}" | ||
305 | fi | 287 | fi |
306 | 288 | ||
307 | AC_SUBST([evas_image_loader_$1_cflags]) | 289 | AC_SUBST([evas_image_loader_$1_cflags]) |