Attachment 57445 Details for Bug 21789 – replace openjpeg compile test with version check

[patch] replace openjpeg compile test with version check

0002-autoconf-replace-openjpeg-compile-test-with-a-versio.patch (text/plain), 1.32 KB, created by Adrian Johnson on 2012-02-22 03:05:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Johnson

Created: 2012-02-22 03:05:17 UTC

Size: 1.32 KB

patch

obsolete

>From 2d232e23825d731b0589c0531bd854acb0114aa3 Mon Sep 17 00:00:00 2001
>From: Adrian Johnson <ajohnson@redneon.com>
>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 <openjpeg.h>
>-], [
>-  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
>

Actions: View | Splinter Review

Attachments on bug 21789: 25960 | 57444 | 57445

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.