From 697804f48f4217dab145d96175c6cddf560ec614 Mon Sep 17 00:00:00 2001 From: Tomáš Chvátal Date: Thu, 16 Apr 2015 10:13:06 +0200 Subject: Make cpp/poppler-version.h header optional MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Older popler (SLE11) does not have this header yet. With the code simply if the header not found define version to oldest possible working candidate and also raise the .pc check to the same. Change-Id: I039c879879188fe2eb90cd119b80a1d6354a6a9c Reviewed-on: https://gerrit.libreoffice.org/15339 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'sdext/source') diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx index d15491b52ab6..f4fa810ebaa9 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx @@ -21,6 +21,7 @@ #define INCLUDED_SDEXT_SOURCE_PDFIMPORT_XPDFWRAPPER_PDFIOUTDEV_GPL_HXX #include +#include #if defined __GNUC__ # pragma GCC diagnostic push @@ -50,7 +51,14 @@ class GfxPath; class GfxFont; class PDFDoc; +#if HAVE_POPPLER_VERSION_H #include +#else +#define POPPLER_VERSION "0.12.3" +#define POPPLER_VERSION_MAJOR 0 +#define POPPLER_VERSION_MINOR 12 +#define POPPLER_VERSION_MICRO 3 +#endif #define POPPLER_CHECK_VERSION(major,minor,micro) \ (POPPLER_VERSION_MAJOR > (major) || \ (POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR > (minor)) || \ -- cgit