X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=configure.ac;h=93a27fa7bea53e8657b0c591c0857e7473289fcc;hb=1be39b2c90926000cb6ba37d78314cbca5940422;hp=bb04647c366be80b8a6a6cb41501db3e8122f281;hpb=a94a0aa428f689cbcc272c71762b7d5a4b1275de;p=evince.git

diff --git a/configure.ac b/configure.ac
index bb04647c..93a27fa7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@
 # *****************************************************************************
 
 m4_define([ev_major_version],[2])
-m4_define([ev_minor_version],[31])
-m4_define([ev_micro_version],[90])
+m4_define([ev_minor_version],[33])
+m4_define([ev_micro_version],[0])
 m4_define([ev_extra_version],[])
 m4_define([ev_version],[ev_major_version.ev_minor_version.ev_micro_version()ev_extra_version])
 
@@ -123,7 +123,7 @@ AM_CONDITIONAL([PLATFORM_WIN32],[test "$with_platform" = "win32"])
 
 AC_MSG_CHECKING([which gtk+ version to compile against])
 AC_ARG_WITH([gtk],
-  [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])],
+  [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 3.0)])],
   [case "$with_gtk" in
      2.0|3.0) ;;
      *) AC_MSG_ERROR([invalid gtk version specified]) ;;
@@ -139,11 +139,11 @@ KEYRING_REQUIRED=2.22.0
 case "$with_gtk" in
   2.0) GTK_API_VERSION=2.0
        GAIL_API_VERSION=
-       GTK_REQUIRED=2.21.5
+       GTK_REQUIRED=2.22.0
        ;;
   3.0) GTK_API_VERSION=3.0
        GAIL_API_VERSION=-3.0
-       GTK_REQUIRED=2.90.5
+       GTK_REQUIRED=2.90.8
        ;;
 esac
 
@@ -512,6 +512,7 @@ if test "x$enable_pdf" = "xyes"; then
 	    AC_CHECK_FUNCS(poppler_page_get_text_layout)
 	    AC_CHECK_FUNCS(poppler_page_get_selected_text)
 	    AC_CHECK_FUNCS(poppler_page_add_annot)
+	    AC_CHECK_FUNCS(poppler_document_is_linearized)
 	    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
@@ -732,7 +733,7 @@ if test "x$enable_pixbuf" = "xyes"; then
 	EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}image/*;"
 fi
 if test "x$enable_xps" = "xyes"; then
-   	EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/vnd.ms-xpsdocument;"
+   	EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/oxps;application/vnd.ms-xpsdocument;"
 fi
 AC_SUBST(EVINCE_MIME_TYPES)