X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=configure.ac;h=2fee0e918bdae79c44953c464cab8c9cef57f3d7;hb=e769474337c9a6ffdaed2327056e8de2f7ca9ee4;hp=f36495ba173aca3a35ee0a3f019cf1f115194e97;hpb=86e41a9d457049a4cc45efba0edcb15efbc6b045;p=evince.git diff --git a/configure.ac b/configure.ac index f36495ba..2fee0e91 100644 --- a/configure.ac +++ b/configure.ac @@ -3,13 +3,13 @@ # ***************************************************************************** m4_define([ev_major_version],[2]) -m4_define([ev_minor_version],[31]) -m4_define([ev_micro_version],[5]) +m4_define([ev_minor_version],[91]) +m4_define([ev_micro_version],[2]) m4_define([ev_extra_version],[]) 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]) +m4_define([ev_api_version], [3.0]) # Libtool versioning. The backend and view libraries have separate versions. # Before making a release, the libtool version should be modified. @@ -21,14 +21,14 @@ m4_define([ev_api_version], [2.30]) # - If the interface is the same as the previous version, change to C:R+1:A # Libtool version of the backend library -m4_define([ev_document_lt_current],[2]) +m4_define([ev_document_lt_current],[3]) m4_define([ev_document_lt_revision],[0]) m4_define([ev_document_lt_age],[0]) m4_define([ev_document_lt_version_info],[ev_document_lt_current:ev_document_lt_revision:ev_document_lt_age]) m4_define([ev_document_lt_current_minus_age],[m4_eval(ev_document_lt_current - ev_document_lt_age)]) # Libtool version of the view library -m4_define([ev_view_lt_current],[2]) +m4_define([ev_view_lt_current],[3]) m4_define([ev_view_lt_revision],[0]) m4_define([ev_view_lt_age],[0]) m4_define([ev_view_lt_version_info],[ev_view_lt_current:ev_view_lt_revision:ev_view_lt_age]) @@ -122,9 +122,11 @@ AM_CONDITIONAL([PLATFORM_HILDON],[test "$with_platform" = "hildon"]) AM_CONDITIONAL([PLATFORM_WIN32],[test "$with_platform" = "win32"]) dnl Specify required versions of dependencies -GTK_REQUIRED=2.90.5 +CAIRO_REQUIRED=1.10.0 GLIB_REQUIRED=2.25.11 KEYRING_REQUIRED=2.22.0 +GTK_REQUIRED=2.91.3 + AC_SUBST([GLIB_REQUIRED]) AC_SUBST([GTK_REQUIRED]) @@ -143,7 +145,7 @@ dnl Check dependencies PKG_CHECK_MODULES(LIBDOCUMENT, gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED) PKG_CHECK_MODULES(LIBVIEW, gtk+-3.0 >= $GTK_REQUIRED gail-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED) -PKG_CHECK_MODULES(BACKEND, gtk+-3.0 >= $GTK_REQUIRED) +PKG_CHECK_MODULES(BACKEND, cairo >= $CAIRO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED) PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED) SHELL_PLATFORM_PKGS= @@ -412,8 +414,8 @@ AC_ARG_ENABLE([previewer], [Disable the GNOME Document Previewer])], [], [case "$with_platform" in - gnome) enable_previewer=yes ;; - *) enable_previewer=no ;; + hildon) enable_previewer=no ;; + *) enable_previewer=yes ;; esac]) if test x$enable_previewer = "xyes" ; then @@ -489,6 +491,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 @@ -661,20 +664,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 ==================================================== @@ -699,8 +711,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) @@ -776,11 +788,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 @@ -863,5 +875,5 @@ Configure summary: DVI Backend........: $enable_dvi Pixbuf Backend.....: $enable_pixbuf Comics Backend.....: $enable_comics - Impress Backend....: $enable_impress + XPS Backend........: $enable_xps "