From f210958704e219d23ceebd8b5ed3603f789a1686 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Campos Date: Tue, 8 Apr 2008 09:50:20 +0000 Subject: [PATCH] Fix build (again) when poppler version is 0.6 2008-04-08 Carlos Garcia Campos * configure.ac: Fix build (again) when poppler version is 0.6 svn path=/trunk/; revision=2997 --- ChangeLog | 6 ++++++ configure.ac | 9 +++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 28cadc4b..020a5762 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-04-08 Carlos Garcia Campos + + * configure.ac: + + Fix build (again) when poppler version is 0.6 + 2008-04-08 Carlos Garcia Campos * backend/djvu/djvu-links.c: (build_tree): diff --git a/configure.ac b/configure.ac index 35bc7284..3b25d38e 100644 --- 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]) -- 2.43.5