evince r2997 - trunk

[carlosgc svn gnome org]

Author: carlosgc
Date: Tue Apr  8 10:50:20 2008
New Revision: 2997
URL: http://svn.gnome.org/viewvc/evince?rev=2997&view=rev

Log:
2008-04-08  Carlos Garcia Campos  <carlosgc gnome org>

	* configure.ac:

	Fix build (again) when poppler version is 0.6


Modified:
   trunk/ChangeLog
   trunk/configure.ac

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Apr  8 10:50:20 2008
@@ -224,11 +224,12 @@
 	    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])