~inkscape+alexander/inkscape/flatten

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Alexander Brock
  • Date: 2015-05-31 17:41:01 UTC
  • mfrom: (13749.1.441 Inkscape)
  • Revision ID: brock.alexander@web.de-20150531174101-2roftkxg6oy1oav5
MergeĀ lp:inkscape

Show diffs side-by-side

added added

removed removed

Lines of Context:
421
421
        [enable_poppler_cairo=$enableval], [enable_poppler_cairo=yes])
422
422
 
423
423
POPPLER_CFLAGS=""
424
 
PKG_CHECK_MODULES(POPPLER, poppler >= 0.5.9, poppler=yes, poppler=no)
 
424
PKG_CHECK_MODULES(POPPLER, poppler >= 0.8.3, poppler=yes, poppler=no)
425
425
 
426
426
if test "x$poppler" = "xyes"; then
427
427
        dnl Working libpoppler
428
428
        dnl Have to test libpoppler-glib presence
429
 
        PKG_CHECK_MODULES(POPPLER_GLIB, poppler-glib >= 0.5.9, poppler_glib=yes, poppler_glib=no)
 
429
        PKG_CHECK_MODULES(POPPLER_GLIB, poppler-glib >= 0.8.3, poppler_glib=yes, poppler_glib=no)
430
430
        if test "x$poppler_glib" = "xyes"; then
431
431
                dnl Working libpoppler-glib found
432
432
                dnl Check whether the Cairo SVG backend is available
438
438
        if test "x$enable_poppler_cairo" = "xyes"; then
439
439
                dnl Have to test libpoppler-cairo presence for PDF preview
440
440
                dnl AC_CHECK_HEADER(Magick++.h, magick_ok=yes, magick_ok=no)
441
 
                PKG_CHECK_MODULES(POPPLER_CAIRO, poppler-cairo >= 0.5.9, poppler_cairo=yes, poppler_cairo=no)
 
441
                PKG_CHECK_MODULES(POPPLER_CAIRO, poppler-cairo >= 0.8.3, poppler_cairo=yes, poppler_cairo=no)
442
442
                if test "x$poppler_glib" = "xyes" -a "x$poppler_cairo" = "xyes" -a \
443
443
                        "x$cairo_svg" = "xno"
444
444
                then
460
460
AC_SUBST(POPPLER_CFLAGS)
461
461
AC_SUBST(POPPLER_LIBS)
462
462
 
463
 
PKG_CHECK_MODULES(POPPLER_GFXFONT, poppler >= 0.8.3, popplernew=yes, popplernew=no)
464
 
if test "x$popplernew" = "xyes"; then
465
 
        AC_DEFINE(POPPLER_NEW_GFXFONT, 1, [Use GfxFont from Poppler >= 0.8.3])
466
 
fi
467
 
 
468
463
PKG_CHECK_MODULES(POPPLER_NEWERRORAPI, poppler >= 0.20.0, popplernewerror=yes, popplernewerror=no)
469
464
if test "x$popplernewerror" = "xyes"; then
470
465
        AC_DEFINE(POPPLER_NEW_ERRORAPI, 1, [Use new error API from Poppler >= 0.20.0])