From 2d232e23825d731b0589c0531bd854acb0114aa3 Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Wed, 22 Feb 2012 21:21:52 +1030 Subject: [PATCH 2/2] autoconf: replace openjpeg compile test with a version test Now that openjpeg 1.5 is released and supports pkg-config the compile test can be replaced with a pkg-config version check. --- configure.ac | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index f392c7f..e90632d 100644 --- a/configure.ac +++ b/configure.ac @@ -177,14 +177,9 @@ if test x$enable_libopenjpeg = xyes; then AC_SUBST(LIBOPENJPEG_CFLAGS) AC_SUBST(LIBOPENJPEG_LIBS) AC_DEFINE(ENABLE_LIBOPENJPEG) - AC_TRY_COMPILE([ -#include -], [ - int foo = OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG; -], have_openjpeg_flag="yes", am_cv_proto_iconv_arg1="no") - if test x$have_openjpeg_flag = xyes; then - AC_DEFINE(WITH_OPENJPEG_IGNORE_PCLR_CMAP_CDEF_FLAG, 1, [OpenJPEG with the OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG flag.]) - fi + PKG_CHECK_EXISTS(LIBOPENJPEG, libopenjpeg >= 1.5, + [AC_DEFINE(WITH_OPENJPEG_IGNORE_PCLR_CMAP_CDEF_FLAG, 1, [OpenJPEG with the OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG flag.])], + []); fi AM_CONDITIONAL(BUILD_LIBOPENJPEG, test x$enable_libopenjpeg = xyes) -- 1.7.5.4