[release] 2.91.0

[evince.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ca2384dd8ff0d5b843c343856211c57ca8eb1af1..aad2f5e274e2ff274701339b39aebb0537463d29 100644 (file)
--- 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],[91])
+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
@@ -684,20 +685,29 @@ AM_CONDITIONAL(ENABLE_COMICS, test x$enable_comics = xyes)
 
 dnl ================== End of comic book checks ============================================
 
-dnl ================== impress book checks ===================================================
+dnl ================== XPS checks ===================================================
 
-AC_ARG_ENABLE(impress,
-       [AS_HELP_STRING([--enable-impress],
-                       [Compile with support for impress presentations])],
-       [enable_impress=$enableval],
-       [enable_impress=no])
-       
-if test "x$enable_impress" = "xyes"; then
-       AC_DEFINE([ENABLE_IMPRESS], [1], [Enable support for impress.])
-fi 
-AM_CONDITIONAL(ENABLE_IMPRESS, test x$enable_impress = xyes)
+AC_ARG_ENABLE(xps,
+       [AS_HELP_STRING([--enable-xps],
+                       [Compile with support for XPS documents.])],
+       [enable_xps=$enableval],
+       [enable_xps=yes])
+
+if test "x$enable_xps" = "xyes"; then
+   GXPS_REQUIRED=0.0.1
+   PKG_CHECK_MODULES(GXPS, libgxps >= $GXPS_REQUIRED,enable_xps=yes,enable_xps=no)
+
+   if test "x$enable_xps" = "xyes"; then
+      AC_DEFINE([ENABLE_XPS], [1], [Enable support for XPS documents.])
+   else
+      enable_xps="no"
+      AC_MSG_WARN(["XPS support is disabled since libgxps (version >= $GXPS_REQUIRED) is needed])
+   fi
+fi
+
+AM_CONDITIONAL(ENABLE_XPS, test x$enable_xps = xyes)
 
-dnl ================== End of impress book checks ============================================
+dnl ================== End of XPS checks ===================================================
 
 dnl =================== Mime types list ====================================================
 
@@ -722,8 +732,8 @@ fi
 if test "x$enable_pixbuf" = "xyes"; then
        EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}image/*;"
 fi
-if test "x$enable_impress" = "xyes"; then
-       EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/vnd.sun.xml.impress;application/vnd.oasis.opendocument.presentation;"
+if test "x$enable_xps" = "xyes"; then
+       EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/oxps;application/vnd.ms-xpsdocument;"
 fi
 AC_SUBST(EVINCE_MIME_TYPES)
 
@@ -799,11 +809,11 @@ backend/comics/Makefile
 backend/djvu/Makefile
 backend/dvi/Makefile
 backend/dvi/mdvi-lib/Makefile
-backend/impress/Makefile
 backend/pdf/Makefile
 backend/pixbuf/Makefile
 backend/ps/Makefile
 backend/tiff/Makefile
+backend/xps/Makefile
 cut-n-paste/Makefile
 cut-n-paste/gimpcellrenderertoggle/Makefile
 cut-n-paste/smclient/Makefile
@@ -887,5 +897,5 @@ Configure summary:
        DVI Backend........:  $enable_dvi
        Pixbuf Backend.....:  $enable_pixbuf
        Comics Backend.....:  $enable_comics
-       Impress Backend....:  $enable_impress
+       XPS Backend........:  $enable_xps
 "