diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2007-10-20 08:42:05 +0000 |
|---|---|---|
| committer | joncruz <joncruz@users.sourceforge.net> | 2007-10-20 08:42:05 +0000 |
| commit | 39fb9b70c87570854e4e0e69b31a7fd2348c321b (patch) | |
| tree | 084c49c6437560aafbcb949d91527f744c52cf10 | |
| parent | updated Slovak (sk) translation in trunk (diff) | |
| download | inkscape-39fb9b70c87570854e4e0e69b31a7fd2348c321b.tar.gz inkscape-39fb9b70c87570854e4e0e69b31a7fd2348c321b.zip | |
Adding config option to block use of libpoppler-cairo (for misdetected situtations)
(bzr r3933)
| -rw-r--r-- | configure.ac | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 019fe833e..4f86ff831 100644 --- a/configure.ac +++ b/configure.ac @@ -465,6 +465,10 @@ dnl ****************************** dnl Libpoppler checking dnl ****************************** +AC_ARG_ENABLE(poppler-cairo, + AC_HELP_STRING([--enable-poppler-cairo], [Enable libpoppler-cairo for rendering PDF preview]), + [enable_poppler_cairo=$enableval], [enable_poppler_cairo=yes]) + POPPLER_CFLAGS="" PKG_CHECK_MODULES(POPPLER, poppler >= 0.5.9, poppler=yes, poppler=no) @@ -481,13 +485,16 @@ if test "x$poppler" = "xyes"; then POPPLER_LIBS="$POPPLER_LIBS -lpoppler-glib " fi fi - dnl Have to test libpoppler-cairo presence for PDF preview - 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$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.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 + fi fi if test "x$poppler" = "xyes"; then @@ -929,5 +936,6 @@ Configuration: Enable LittleCms: ${enable_lcms} Enable Inkboard: ${with_inkboard} Enable SSL in Inkboard: ${with_inkboard_ssl} + Enable Poppler-Cairo: ${enable_poppler_cairo} ImageMagick Magick++: ${magick_ok} " |