|
 |
5506cea |
--- a/configure.ac 2011-11-10 13:22:02.062474990 +0000
|
|
|
5506cea |
+++ b/configure.ac 2011-11-10 13:22:35.072472880 +0000
|
|
|
5506cea |
@@ -9546,16 +9546,6 @@
|
|
|
82f2389 |
AC_MSG_RESULT([external])
|
|
|
82f2389 |
SYSTEM_POPPLER=YES
|
|
|
82f2389 |
PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 )
|
|
|
82f2389 |
- AC_LANG_PUSH([C++])
|
|
|
82f2389 |
- save_CXXFLAGS=$CXXFLAGS
|
|
|
82f2389 |
- save_CPPFLAGS=$CPPFLAGS
|
|
|
82f2389 |
- CXXFLAGS="$CXXFLAGS $POPPLER_CFLAGS"
|
|
|
82f2389 |
- CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS"
|
|
|
82f2389 |
- AC_CHECK_HEADER([cpp/poppler-version.h], [],
|
|
|
82f2389 |
- [AC_MSG_ERROR([cpp/poppler-version.h not found. Install poppler])], [])
|
|
|
82f2389 |
- CXXFLAGS=$save_CXXFLAGS
|
|
|
82f2389 |
- CPPFLAGS=$save_CPPFLAGS
|
|
|
82f2389 |
- AC_LANG_POP([C++])
|
|
|
5506cea |
libo_MINGW_CHECK_DLL([POPPLER], [libpoppler])
|
|
|
82f2389 |
else
|
|
|
82f2389 |
AC_MSG_RESULT([internal])
|
|
|
82f2389 |
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2011-11-10 13:22:11.949473646 +0000
|
|
|
82f2389 |
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2011-11-10 13:23:24.889473889 +0000
|
|
|
82f2389 |
@@ -64,16 +64,7 @@
|
|
|
82f2389 |
class GfxPath;
|
|
|
82f2389 |
class GfxFont;
|
|
|
82f2389 |
class PDFDoc;
|
|
|
82f2389 |
-#ifndef SYSTEM_POPPLER
|
|
|
82f2389 |
#define POPPLER_CHECK_VERSION(major,minor,micro) (0)
|
|
|
82f2389 |
-typedef GString GooString;
|
|
|
82f2389 |
-#else
|
|
|
82f2389 |
-#include <cpp/poppler-version.h>
|
|
|
82f2389 |
-#define POPPLER_CHECK_VERSION(major,minor,micro) \
|
|
|
82f2389 |
- (POPPLER_VERSION_MAJOR > (major) || \
|
|
|
82f2389 |
- (POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR > (minor)) || \
|
|
|
82f2389 |
- (POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR == (minor) && POPPLER_VERSION_MICRO >= (micro)))
|
|
|
82f2389 |
-#endif
|
|
|
82f2389 |
|
|
|
82f2389 |
namespace pdfi
|
|
|
82f2389 |
{
|