[pdf] Fix build with poppler without cairo support

Fixes bug #582543

diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc
index 38ab1d5a846cc20a344ca67bb1f7c8d72b875e3c..a9a0a8555e1763311d4300c8a6be6b86dc386862 100644 (file)
--- a/backend/pdf/ev-poppler.cc
+++ b/backend/pdf/ev-poppler.cc
@@ -1236,10 +1236,11 @@ GdkPixbuf *
 pdf_document_images_get_image (EvDocumentImages *document_images,
                               EvImage          *image)
 {
+       GdkPixbuf       *retval = NULL;
+#ifdef HAVE_POPPLER_PAGE_GET_IMAGE
        PdfDocument     *pdf_document;
        PopplerPage     *poppler_page;
        cairo_surface_t *surface;
-       GdkPixbuf       *retval = NULL;
 
        pdf_document = PDF_DOCUMENT (document_images);
        poppler_page = poppler_document_get_page (pdf_document->document,
@@ -1252,7 +1253,7 @@ pdf_document_images_get_image (EvDocumentImages *document_images,
        }
 
        g_object_unref (poppler_page);
-
+#endif
        return retval;
 }
 

diff --git a/configure.ac b/configure.ac
index 880c57ccb5a76487a8c191631c993f703ff37ab8..099c3a51ca2c05feb8e7585ed8ecc91fbd607411 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -367,6 +367,7 @@ if test "x$enable_pdf" = "xyes"; then
            evince_save_LIBS=$LIBS
            LIBS="$LIBS $POPPLER_LIBS"
            AC_CHECK_FUNCS(poppler_page_render)
+           AC_CHECK_FUNCS(poppler_page_get_image)
            LIBS=$evince_save_LIBS
 
            PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf, enable_cairo_pdf=yes, enable_cairo_pdf=no)