Attachment 57444 Details for Bug 21789 – use pkgconfig to find openjpeg

[patch] use pkgconfig to find openjpeg

0001-autoconf-Use-pkgconfig-to-check-for-libopenjpeg.patch (text/plain), 2.24 KB, created by Adrian Johnson on 2012-02-22 02:57:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Johnson

Created: 2012-02-22 02:57:58 UTC

Size: 2.24 KB

patch

obsolete

>From f87cafbbf391928c720847a097dce4e8791b9c0b Mon Sep 17 00:00:00 2001
>From: Adrian Johnson <ajohnson@redneon.com>
>Date: Wed, 22 Feb 2012 21:01:59 +1030
>Subject: [PATCH 1/2] autoconf: Use pkgconfig to check for libopenjpeg
>
>and if not found fallback to using AC_CHECK_LIB/AC_CHECK_HEADERS
>
>openjpeg >= 1.4 installs a pkgconfig file
>
>Bug 21789
>---
> configure.ac |   28 +++++++++++++++++-----------
> 1 files changed, 17 insertions(+), 11 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index 91b0d70..f392c7f 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -148,27 +148,33 @@ then
> fi
> 
> 
>-dnl Test for libopenjpeg
>+dnl Test for libopenjpeg. Versions prior to 1.4 do not provide a pkgconfig file.
> AC_ARG_ENABLE(libopenjpeg,
> 	      AC_HELP_STRING([--disable-libopenjpeg],
> 	                     [Don't build against libopenjpeg.]),
>               enable_libopenjpeg=$enableval,
>               enable_libopenjpeg="try")
> if test x$enable_libopenjpeg = xyes; then
>-  AC_CHECK_LIB([openjpeg], [opj_cio_open],,
>-	       AC_MSG_ERROR("*** libopenjpeg library not found ***"))
>-  AC_CHECK_HEADERS([openjpeg.h],,
>-		   AC_MSG_ERROR("*** libopenjpeg headers not found ***"))
>+  PKG_CHECK_MODULES(LIBOPENJPEG, libopenjpeg,
>+  		    [],
>+    		    [AC_CHECK_LIB([openjpeg], [opj_cio_open],
>+  			LIBOPENJPEG_LIBS="-lopenjpeg",
>+		        AC_MSG_ERROR("*** libopenjpeg library not found ***"))
>+		     AC_CHECK_HEADERS([openjpeg.h],,
>+		     	AC_MSG_ERROR("*** libopenjpeg headers not found ***"))])
> elif test x$enable_libopenjpeg = xtry; then
>-  AC_CHECK_LIB([openjpeg], [opj_cio_open],
>-               [enable_libopenjpeg="yes"],
>-	       [enable_libopenjpeg="no"])
>-  AC_CHECK_HEADERS([openjpeg.h],,
>-		   [enable_libopenjpeg="no"])
>+  PKG_CHECK_MODULES(LIBOPENJPEG, libopenjpeg,
>+                    [enable_libopenjpeg="yes"],
>+  		    [AC_CHECK_LIB([openjpeg], [opj_cio_open],
>+		        [enable_libopenjpeg="yes"
>+  			 LIBOPENJPEG_LIBS="-lopenjpeg"],
>+	                [enable_libopenjpeg="no"])
>+		     AC_CHECK_HEADERS([openjpeg.h],,
>+		         [enable_libopenjpeg="no"])])
> fi
> 
> if test x$enable_libopenjpeg = xyes; then
>-  LIBOPENJPEG_LIBS="-lopenjpeg"
>+  AC_SUBST(LIBOPENJPEG_CFLAGS)
>   AC_SUBST(LIBOPENJPEG_LIBS)
>   AC_DEFINE(ENABLE_LIBOPENJPEG)
>   AC_TRY_COMPILE([
>-- 
>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.