[poppler] 2 commits - configure.ac

Albert Astals Cid aacid at kemper.freedesktop.org
Wed May 7 13:27:48 PDT 2014


 configure.ac |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit d2892cd893e4379914a08e66682ed5c423743a41
Merge: 0844220 7e9fc61
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed May 7 22:27:41 2014 +0200

    Merge remote-tracking branch 'origin/poppler-0.26'

commit 7e9fc61e287889eefd6b08ef5991d31fed79cafd
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed May 7 22:25:59 2014 +0200

    Fix libopenjpeg 1.5 detection on some systems
    
    Someone somewhere decided the pc file will be called libopenjpeg1 instead of libopenjpeg
    
    Bug #78389

diff --git a/configure.ac b/configure.ac
index 0e703d5..fdfe570 100644
--- a/configure.ac
+++ b/configure.ac
@@ -173,7 +173,10 @@ if test x$enable_libopenjpeg = xyes; then
   AC_DEFINE(ENABLE_LIBOPENJPEG)
   PKG_CHECK_EXISTS(libopenjpeg >= 1.5,
       [AC_DEFINE(WITH_OPENJPEG_IGNORE_PCLR_CMAP_CDEF_FLAG, 1, [OpenJPEG with the OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG flag.])],
-      [])
+      [PKG_CHECK_EXISTS(libopenjpeg1 >= 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)


More information about the poppler mailing list