Fix build in FreeBSD. Based on patch by Michael Johnson. Fixes bug

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

	* configure.ac:

	Fix build in FreeBSD. Based on patch by Michael Johnson. Fixes bug
	#526799.

svn path=/trunk/; revision=2995

diff --git a/ChangeLog b/ChangeLog
index 879ae7d7371d942966eb752c56557f74013b8c37..edfc7060eeccfbda7ca6e44be5bc5035cd10c5a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-07  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+       * configure.ac:
+
+       Fix build in FreeBSD. Based on patch by Michael Johnson. Fixes bug
+       #526799.
+       
 2008-04-07  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
 
        * configure.ac:

diff --git a/configure.ac b/configure.ac
index 08db7f05320736721599e8e6c9a6d4084644c057..35bc7284e988ad9f487c739e762a827bb2ab2428 100644 (file)
--- 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