[GNUnet-SVN] r9859 - in Extractor: . src/plugins

[gnunet]

Author: holindho
Date: 2009-12-22 11:25:39 +0100 (Tue, 22 Dec 2009)
New Revision: 9859

Modified:
   Extractor/configure.ac
   Extractor/src/plugins/pdf_extractor.cc
Log:
support older libpopplers


Modified: Extractor/configure.ac
===================================================================
--- Extractor/configure.ac      2009-12-22 08:12:43 UTC (rev 9858)
+++ Extractor/configure.ac      2009-12-22 10:25:39 UTC (rev 9859)
@@ -224,6 +224,18 @@
          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

Modified: Extractor/src/plugins/pdf_extractor.cc
===================================================================
--- Extractor/src/plugins/pdf_extractor.cc      2009-12-22 08:12:43 UTC (rev 
9858)
+++ Extractor/src/plugins/pdf_extractor.cc      2009-12-22 10:25:39 UTC (rev 
9859)
@@ -203,9 +203,14 @@
       }
       {
        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);