Attachment 25960 Details for Bug 21789 – Patch to find openjpeg header in more complex locations as well

[patch] Patch to find openjpeg header in more complex locations as well

poppler-0.10.5-openjpeg.07.patch (text/plain), 1.79 KB, created by Moritz Barsnick on 2009-05-18 04:40:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Moritz Barsnick

Created: 2009-05-18 04:40:44 UTC

Size: 1.79 KB

patch

obsolete

>diff -ur poppler-0.10.5/configure.ac poppler-0.10.5-openjpeg/configure.ac
>--- poppler-0.10.5/configure.ac	2009-03-12 00:09:29.000000000 +0100
>+++ poppler-0.10.5-openjpeg/configure.ac	2009-03-18 22:49:05.000000000 +0100
>@@ -146,14 +146,23 @@
> 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 ***"))
>+  AC_CHECK_HEADERS([openjpeg.h],
>+                   ,
>+                   [AC_CHECK_HEADERS([openjpeg/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"])
>+  AC_CHECK_HEADERS([openjpeg.h],
>+                   ,
>+                   [AC_CHECK_HEADERS([openjpeg/openjpeg.h],
>+                                    ,
>+		                    [enable_libopenjpeg="no"]])
>+		   )
> fi
> 
> if test x$enable_libopenjpeg = xyes; then
>diff -ur poppler-0.10.5/poppler/JPEG2000Stream.h poppler-0.10.5-openjpeg/poppler/JPEG2000Stream.h
>--- poppler-0.10.5/poppler/JPEG2000Stream.h	2008-10-09 22:30:34.000000000 +0200
>+++ poppler-0.10.5-openjpeg/poppler/JPEG2000Stream.h	2009-03-18 22:49:51.000000000 +0100
>@@ -14,7 +14,17 @@
> #ifndef JPEG2000STREAM_H
> #define JPEG2000STREAM_H
> 
>+#ifdef HAVE_CONFIG_H
>+#include <config.h>
>+#endif
>+
>+#ifdef HAVE_OPENJPEG_H
> #include <openjpeg.h>
>+#else
>+#ifdef HAVE_OPENJPEG_OPENJPEG_H
>+#include <openjpeg/openjpeg.h>
>+#endif
>+#endif
> 
> #include "goo/gtypes.h"
> #include "Object.h"

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.