From d069b08079f06c8c062b9994ad97762d59829370 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Campos Date: Mon, 7 Apr 2008 20:49:53 +0000 Subject: [PATCH] Fix build in FreeBSD. Based on patch by Michael Johnson. Fixes bug 2008-04-07 Carlos Garcia Campos * configure.ac: Fix build in FreeBSD. Based on patch by Michael Johnson. Fixes bug #526799. svn path=/trunk/; revision=2995 --- ChangeLog | 7 +++++++ configure.ac | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 879ae7d7..edfc7060 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-04-07 Carlos Garcia Campos + + * configure.ac: + + Fix build in FreeBSD. Based on patch by Michael Johnson. Fixes bug + #526799. + 2008-04-07 Nickolay V. Shmyrev * configure.ac: diff --git a/configure.ac b/configure.ac index 08db7f05..35bc7284 100644 --- a/configure.ac +++ b/configure.ac @@ -224,8 +224,8 @@ 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\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\?/\1/'` - POPPLER_MINOR_VERSION=`$PKG_CONFIG --modversion poppler-glib | sed 's/0\.\([[0-9]]*\)\(\.\([[0-9]]*\)\)\?/\3/'` + 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 fi @@ -234,12 +234,12 @@ if test "x$enable_pdf" = "xyes"; then AC_DEFINE_UNQUOTED([POPPLER_MINOR_VERSION], $POPPLER_MINOR_VERSION, [Poppler minor version number]) PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf, enable_cairo_pdf=yes, enable_cairo_pdf=no) - if test x$enable_cairo_pdf == xyes; then + if test x$enable_cairo_pdf = xyes; then AC_DEFINE([HAVE_CAIRO_PDF], [1], [defined if cairo-pdf is available]) fi PKG_CHECK_MODULES(CAIRO_PS, cairo-ps, enable_cairo_ps=yes, enable_cairo_ps=no) - if test x$enable_cairo_ps == xyes; then + if test x$enable_cairo_ps = xyes; then AC_DEFINE([HAVE_CAIRO_PS], [1], [defined if cairo-ps is available]) fi else -- 2.43.5