diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2016-01-11 14:40:38 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2016-01-11 14:40:38 +0000 |
| commit | 434246be06812392015321a5fa2175c4e32136fd (patch) | |
| tree | 9c8a4c60e003d942e370dea98d541e2e06cb192e /configure.ac | |
| parent | Bump poppler dep to 0.15.1 (see bug #1419263) (diff) | |
| download | inkscape-434246be06812392015321a5fa2175c4e32136fd.tar.gz inkscape-434246be06812392015321a5fa2175c4e32136fd.zip | |
Bump poppler dep to 0.20.0
Fixed bugs:
- https://launchpad.net/bugs/1419263
(bzr r14573)
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index edb4f4026..ff543aef3 100644 --- a/configure.ac +++ b/configure.ac @@ -432,12 +432,12 @@ AC_ARG_ENABLE(poppler-cairo, [enable_poppler_cairo=$enableval], [enable_poppler_cairo=yes]) POPPLER_CFLAGS="" -PKG_CHECK_MODULES(POPPLER, poppler >= 0.15.1, poppler=yes, poppler=no) +PKG_CHECK_MODULES(POPPLER, poppler >= 0.20.0, poppler=yes, poppler=no) if test "x$poppler" = "xyes"; then dnl Working libpoppler dnl Have to test libpoppler-glib presence - PKG_CHECK_MODULES(POPPLER_GLIB, poppler-glib >= 0.15.1, poppler_glib=yes, poppler_glib=no) + PKG_CHECK_MODULES(POPPLER_GLIB, poppler-glib >= 0.20.0, poppler_glib=yes, poppler_glib=no) if test "x$poppler_glib" = "xyes"; then dnl Working libpoppler-glib found dnl Check whether the Cairo SVG backend is available @@ -449,7 +449,7 @@ if test "x$poppler" = "xyes"; then if test "x$enable_poppler_cairo" = "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.15.1, poppler_cairo=yes, poppler_cairo=no) + PKG_CHECK_MODULES(POPPLER_CAIRO, poppler-cairo >= 0.20.0, poppler_cairo=yes, poppler_cairo=no) if test "x$poppler_glib" = "xyes" -a "x$poppler_cairo" = "xyes" -a \ "x$cairo_svg" = "xno" then @@ -471,11 +471,6 @@ fi AC_SUBST(POPPLER_CFLAGS) AC_SUBST(POPPLER_LIBS) -PKG_CHECK_MODULES(POPPLER_NEWERRORAPI, poppler >= 0.20.0, popplernewerror=yes, popplernewerror=no) -if test "x$popplernewerror" = "xyes"; then - AC_DEFINE(POPPLER_NEW_ERRORAPI, 1, [Use new error API from Poppler >= 0.20.0]) -fi - ink_svd_CPPFLAGS=$CPPFLAGS ink_svd_LIBS=$LIBS CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS" |