Fix build (again) when poppler version is 0.6

2008-04-08  Carlos Garcia Campos  <carlosgc@gnome.org>

	* configure.ac:

	Fix build (again) when poppler version is 0.6

svn path=/trunk/; revision=2997

diff --git a/ChangeLog b/ChangeLog
index 28cadc4b62622d8e3ff9e944bd791408a9ea65ef..020a5762a37bad6cbcc858a89d1725ad7fa26d2a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-08  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+       * configure.ac:
+
+       Fix build (again) when poppler version is 0.6
+       
 2008-04-08  Carlos Garcia Campos  <carlosgc@gnome.org>
 
        * backend/djvu/djvu-links.c: (build_tree):

diff --git a/configure.ac b/configure.ac
index 35bc7284e988ad9f487c739e762a827bb2ab2428..3b25d38e868f92f6eb5c510a430e808adb3f2f33 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -224,11 +224,12 @@ if test "x$enable_pdf" = "xyes"; then
            AC_CHECK_FUNCS(poppler_page_get_image)
            LIBS=$evince_save_LIBS
 
-           POPPLER_MAJOR_VERSION=`$PKG_CONFIG --modversion poppler-glib | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2 /'`
-           POPPLER_MINOR_VERSION=`$PKG_CONFIG --modversion poppler-glib | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3 /'`
-           if test -z "$POPPLER_MINOR_VERSION"; then
-             POPPLER_MINOR_VERSION=0
+           poppler_version=`$PKG_CONFIG --modversion poppler-glib`
+           if test x$poppler_version = x0.6; then
+                   poppler_version=0.6.0
            fi
+           POPPLER_MAJOR_VERSION=`echo $poppler_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2 /'`
+           POPPLER_MINOR_VERSION=`echo $poppler_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3 /'`
 
            AC_DEFINE_UNQUOTED([POPPLER_MAJOR_VERSION], $POPPLER_MAJOR_VERSION, [Poppler major version number])
            AC_DEFINE_UNQUOTED([POPPLER_MINOR_VERSION], $POPPLER_MINOR_VERSION, [Poppler minor version number])