summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiklosh <miklosh@users.sourceforge.net>2007-11-18 12:42:17 +0000
committermiklosh <miklosh@users.sourceforge.net>2007-11-18 12:42:17 +0000
commit4768cba5810d5c9a08d0bf7071c9726ea64e14ce (patch)
treea15da494bd5084368455fe7a93c52f3770616b4d
parent- modified the grid to be 0.5 pixels wide to make ti easier to snap to the pi... (diff)
downloadinkscape-4768cba5810d5c9a08d0bf7071c9726ea64e14ce.tar.gz
inkscape-4768cba5810d5c9a08d0bf7071c9726ea64e14ce.zip
Require poppler-glib and poppler-cairo for PDF preview
(bzr r4104)
-rw-r--r--configure.ac12
1 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 340b7e4a8..75bce9381 100644
--- a/configure.ac
+++ b/configure.ac
@@ -489,11 +489,11 @@ if test "x$poppler" = "xyes"; then
dnl Have to test libpoppler-cairo presence for PDF preview
dnl AC_CHECK_HEADER(Magick++.h, magick_ok=yes, magick_ok=no)
PKG_CHECK_MODULES(POPPLER_CAIRO, poppler-cairo >= 0.5.9, poppler_cairo=yes, poppler_cairo=no)
- if test "x$poppler_cairo" = "xyes"; then
- dnl Working libpoppler-cairo found
- dnl Check whether the Cairo FreeType backend is available
- PKG_CHECK_MODULES(CAIRO_FT, cairo-ft, cairo_ft=yes, cairo_ft=no)
- fi
+ if test "x$poppler_glib" = "xyes" -a "x$poppler_cairo" = "xyes" -a \
+ "x$cairo_svg" = "xno"
+ then
+ POPPLER_LIBS="$POPPLER_LIBS -lpoppler-glib "
+ fi
fi
fi
@@ -501,7 +501,7 @@ if test "x$poppler" = "xyes"; then
LIBS="$LIBS $POPPLER_LIBS"
AC_DEFINE(HAVE_POPPLER, 1, [Use libpoppler for direct PDF import])
fi
-if test "x$cairo_ft" = "xyes"; then
+if test "x$poppler_cairo" = "xyes" -a "x$poppler_glib" = "xyes"; then
AC_DEFINE(HAVE_POPPLER_CAIRO, 1, [Use libpoppler-cairo for rendering PDF preview])
fi
if test "x$poppler_glib" = "xyes" -a "x$cairo_svg" = "xyes"; then