[release] 2.31.4.1

[evince.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ddb690b1f541353f750658b8b7d2c095e31f7968..1732c06248e9f1e9560e46e1e870c91844163cc1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,9 +4,9 @@
 
 m4_define([ev_major_version],[2])
 m4_define([ev_minor_version],[31])
-m4_define([ev_micro_version],[3])
-m4_define([ev_extra_version],[])
-m4_define([ev_version],[ev_major_version.ev_minor_version.ev_micro_version()ev_extra_version])
+m4_define([ev_micro_version],[4])
+m4_define([ev_extra_version],[1])
+m4_define([ev_version],[ev_major_version.ev_minor_version.ev_micro_version().ev_extra_version])
 
 # The evince API version
 m4_define([ev_api_version], [2.30])
@@ -123,7 +123,7 @@ AM_CONDITIONAL([PLATFORM_WIN32],[test "$with_platform" = "win32"])
 
 dnl Specify required versions of dependencies
 GTK_REQUIRED=2.21.2
-GLIB_REQUIRED=2.25.7
+GLIB_REQUIRED=2.25.9
 KEYRING_REQUIRED=2.22.0
 AC_SUBST([GLIB_REQUIRED])
 AC_SUBST([GTK_REQUIRED])
@@ -477,6 +477,10 @@ if test "x$enable_pdf" = "xyes"; then
     PKG_CHECK_MODULES(POPPLER, poppler-glib >= $POPPLER_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED,enable_pdf=yes,enable_pdf=no)
 
     if test "x$enable_pdf" = "xyes"; then
+           evince_save_LIBS=$LIBS
+           LIBS="$LIBS $POPPLER_LIBS"
+           AC_CHECK_FUNCS(poppler_page_get_text_layout)
+           LIBS=$evince_save_LIBS
            PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf, enable_cairo_pdf=yes, enable_cairo_pdf=no)
            if test x$enable_cairo_pdf = xyes; then
                    AC_DEFINE([HAVE_CAIRO_PDF], [1], [defined if cairo-pdf is available])
@@ -774,6 +778,8 @@ cut-n-paste/smclient/Makefile
 cut-n-paste/toolbar-editor/Makefile
 cut-n-paste/zoom-control/Makefile
 cut-n-paste/totem-screensaver/Makefile
+cut-n-paste/gail-util/Makefile
+cut-n-paste/synctex/Makefile
 data/evince.desktop.in
 data/Makefile
 data/icons/Makefile