X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=configure.ac;h=e75a7968a39b0835f9fe33da39e7bff3c42f9699;hb=c087ebf90ee6c32656ae925d0c1682b427a21e7e;hp=5224e0da5478de4a0e1ba0dd6bb15cb43ea83241;hpb=ff0503865646c869c2a845355edd5a6392d40e63;p=evince.git

diff --git a/configure.ac b/configure.ac
index 5224e0da..e75a7968 100644
--- a/configure.ac
+++ b/configure.ac
@@ -200,7 +200,8 @@ AC_ARG_ENABLE(pdf,
 
 if test "x$enable_pdf" = "xyes"; then
     POPPLER_REQUIRED=0.5.4
-    PKG_CHECK_MODULES(POPPLER, poppler-glib >= $POPPLER_REQUIRED,enable_pdf=yes,enable_pdf=no)
+    POPPLER_MAX_REQUIRED=0.5.9
+    PKG_CHECK_MODULES(POPPLER, poppler-glib >= $POPPLER_REQUIRED poppler-glib <= $POPPLER_MAX_REQUIRED, enable_pdf=yes,enable_pdf=no)
 
     if test "x$enable_pdf" = "xyes"; then
 	    AC_DEFINE([ENABLE_PDF], [1], [Enable pdf support.])
@@ -219,6 +220,9 @@ if test "x$enable_pdf" = "xyes"; then
 	    if test x$enable_cairo_pdf == xyes; then
 	            AC_DEFINE([HAVE_CAIRO_PDF], [1], [defined if cairo-pdf is available])
             fi
+
+	    POPPLER_VERSION=`$PKG_CONFIG --modversion poppler-glib | sed 's/0\.5\.\([[49]]\)/\1/'`
+	    AC_DEFINE_UNQUOTED(POPPLER_VERSION, $POPPLER_VERSION, [Poppler version.])
     else
 	    AC_MSG_WARN("PDF support is disabled since poppler-glib library version $POPPLER_REQUIRED or newer not found")
     fi