summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 60d227d)
raw | patch | inline | side by side (parent: 60d227d)
author | Krzysztof Kosiński <tweenk.pl@gmail.com> | |
Thu, 25 Mar 2010 02:10:34 +0000 (03:10 +0100) | ||
committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | |
Thu, 25 Mar 2010 02:10:34 +0000 (03:10 +0100) |
rather than a version check; should fix LP #545580
configure.ac | patch | blob | history |
diff --git a/configure.ac b/configure.ac
index d7c38a7c9d233177db54159b419597644d913a01..3835f620e263e6b054c17889de09ec41d8b64c53 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -609,9 +609,31 @@ PKG_CHECK_MODULES(POPPLER_GFXFONT, poppler >= 0.8.3, popplernew=yes, popplernew=
if test "x$popplernew" = "xyes"; then
AC_DEFINE(POPPLER_NEW_GFXFONT, 1, [Use GfxFont from Poppler >= 0.8.3])
fi
-PKG_CHECK_MODULES(POPPLER_COLORSPACE, poppler >= 0.12.2, popplercolor=yes, popplercolor=no)
+
+AC_MSG_CHECKING(for new color space API in Poppler)
+ink_svd_CPPFLAGS=$CPPFLAGS
+ink_svd_LIBS=$LIBS
+CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS"
+LIBS="$LIBS $POPPLER_LIBS"
+popplercolor="no"
+AC_COMPILE_IFELSE([
+#include <GfxState.h>
+
+int main() {
+ typedef GfxColorSpace *(*parse_p)(Object *, Gfx *);
+ parse_p p;
+ p = &GfxColorSpace::parse;
+ return 0;
+}
+], [popplercolor=yes])
+CPPFLAGS=$ink_svd_CPPFLAGS
+LIBS=$ink_svd_LIBS
+
if test "x$popplercolor" = "xyes"; then
AC_DEFINE(POPPLER_NEW_COLOR_SPACE_API, 1, [Use color space API from Poppler >= 0.12.2])
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
fi
dnl ******************************