commit 95db2ed46dd801ab0c3d5e4dd73a5db1ab4b9075
parent b12f11d6971f85bd8e7a7548444d944ef66ce1e5
Author: Heikki Lindholm <holin@iki.fi>
Date: Tue, 22 Dec 2009 10:25:39 +0000
support older libpopplers
Diffstat:
2 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -224,6 +224,18 @@ AC_CHECK_LIB(poppler, _ZTI9MemStream,
AM_CONDITIONAL(HAVE_POPPLER, false))],
AM_CONDITIONAL(HAVE_POPPLER, false))
+AC_MSG_CHECKING(for getPDFMajorVersion in -lpoppler)
+AC_LANG_PUSH(C++)
+SAVED_LDFLAGS=$LDFLAGS
+LDFLAGS="$LDFLAGS -lpoppler"
+AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[#include <poppler/PDFDoc.h>]],
+ [[PDFDoc foo; foo->getPDFMajorVersion(); ]])],
+ [AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_POPPLER_GETPDFMAJORVERSION,1,[Have getPDFMajorVersion in libpoppler])],
+ [AC_MSG_RESULT(no)])
+LDFLAGS=$SAVED_LDFLAGS
+AC_LANG_POP(C++)
# restore LIBS
LIBS=$LIBSOLD
diff --git a/src/plugins/pdf_extractor.cc b/src/plugins/pdf_extractor.cc
@@ -203,9 +203,14 @@ extern "C" {
}
{
char pcnt[64];
+#if HAVE_POPPLER_GETPDFMAJORVERSION
sprintf(pcnt, "PDF %d.%d",
doc->getPDFMajorVersion(),
doc->getPDFMinorVersion());
+#else
+ sprintf(pcnt, "PDF %.1f",
+ doc->getPDFVersion());
+#endif
ADD (pcnt, EXTRACTOR_METATYPE_FORMAT);
}
PID ("CreationDate", EXTRACTOR_METATYPE_CREATION_DATE);