X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=configure.ac;h=e5924c9416c6342d3c0822f586a968968f16a006;hb=HEAD;hp=8730154b2612cb0faf08335f49a4997d6c4c2acb;hpb=e504dcc8929a88f5571d46cc6f1027fc07a65f8f;p=evince.git diff --git a/configure.ac b/configure.ac index 8730154b..e5924c94 100644 --- a/configure.ac +++ b/configure.ac @@ -2,14 +2,14 @@ # Versioning # ***************************************************************************** -m4_define([ev_major_version],[2]) -m4_define([ev_minor_version],[31]) -m4_define([ev_micro_version],[90]) +m4_define([ev_major_version],[3]) +m4_define([ev_minor_version],[0]) +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]) # The evince API version -m4_define([ev_api_version], [2.32]) +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. @@ -121,35 +121,15 @@ fi AM_CONDITIONAL([PLATFORM_HILDON],[test "$with_platform" = "hildon"]) 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)])], - [case "$with_gtk" in - 2.0|3.0) ;; - *) AC_MSG_ERROR([invalid gtk version specified]) ;; - esac], - [with_gtk=2.0]) -AC_MSG_RESULT([$with_gtk]) - dnl Specify required versions of dependencies -CAIRO_REQUIRED=1.9.10 +CAIRO_REQUIRED=1.10.0 GLIB_REQUIRED=2.25.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 - ;; - 3.0) GTK_API_VERSION=3.0 - GAIL_API_VERSION=-3.0 - GTK_REQUIRED=2.90.5 - ;; -esac +GTK_REQUIRED=3.0.2 +NAUTILUS_REQUIRED=2.91.4 AC_SUBST([GLIB_REQUIRED]) AC_SUBST([GTK_REQUIRED]) -AC_SUBST([GTK_API_VERSION]) GNOME_ICON_THEME_REQUIRED=2.17.1 LIBXML_REQUIRED=2.5.0 @@ -164,10 +144,10 @@ dnl Check dependencies # SHELL_LIBS -PKG_CHECK_MODULES(LIBDOCUMENT, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED) -PKG_CHECK_MODULES(LIBVIEW, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gail$GAIL_API_VERSION >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED) -PKG_CHECK_MODULES(BACKEND, cairo >= $CAIRO_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED) -PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED) +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, 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= case "$with_platform" in @@ -193,13 +173,13 @@ case "$with_platform" in ;; esac -PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0 $SHELL_PLATFORM_PKGS]) +PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0 $SHELL_PLATFORM_PKGS]) # ********* # SM client # ********* -GDK_TARGET="$($PKG_CONFIG --variable target gdk-$GTK_API_VERSION)" +GDK_TARGET="$($PKG_CONFIG --variable target gdk-3.0)" AC_MSG_CHECKING([which smclient backend to use]) AC_ARG_WITH([smclient], @@ -221,11 +201,11 @@ if test "$with_smclient" != "no"; then AC_DEFINE([WITH_SMCLIENT],[1],[Define if smclient is enabled]) case "$with_smclient" in - xsmp) SMCLIENT_PKGS="sm >= 1.0.0" ;; + xsmp) SMCLIENT_PKGS="sm >= 1.0.0 ice" ;; *) SMCLIENT_PKGS="" ;; esac - PKG_CHECK_MODULES([SMCLIENT],[gtk+-$GTK_API_VERSION gthread-2.0 $SMCLIENT_PKGS]) + PKG_CHECK_MODULES([SMCLIENT],[gtk+-3.0 gthread-2.0 $SMCLIENT_PKGS]) AC_SUBST([SMCLIENT_CFLAGS]) AC_SUBST([SMCLIENT_LIBS]) fi @@ -262,7 +242,7 @@ AC_ARG_WITH([gtk-unix-print], AC_MSG_RESULT([$with_gtk_unix_print]) if test "$with_gtk_unix_print" = "yes"; then - PKG_CHECK_MODULES(GTKUNIXPRINT, [gtk+-unix-print-$GTK_API_VERSION >= $GTK_REQUIRED]) + PKG_CHECK_MODULES(GTKUNIXPRINT, [gtk+-unix-print-3.0 >= $GTK_REQUIRED]) AC_DEFINE([GTKUNIXPRINT_ENABLED], [1], [Define if gtk+-unix-print is enabled.]) fi @@ -313,35 +293,6 @@ if test x$has_desktop_schemas = xyes; then AC_DEFINE([HAVE_DESKTOP_SCHEMAS], [1], [Whether GSettings Desktop Schemas are available]) fi -dnl ========= Check for GConf - -AC_MSG_CHECKING([whether GConf support is requested]) -AC_ARG_WITH([gconf], - [AS_HELP_STRING([--without-gconf], - [Disable the use of gconf])], - [], - [case "$os_win32" in - yes) with_gconf=no ;; - *) with_gconf=yes ;; - esac]) -AC_MSG_RESULT([$with_gconf]) - -AM_CONDITIONAL([WITH_GCONF],[test "$with_gconf" = "yes"]) - -if test "$with_gconf" = "yes"; then - PKG_CHECK_MODULES([GCONF],[gconf-2.0]) - AC_DEFINE([WITH_GCONF],[1],[Define if GConf support is enabled]) - - AM_GCONF_SOURCE_2 - - AC_PATH_PROG([GCONFTOOL], [gconftool-2], [false]) - if test "$GCONFTOOL" = "false"; then - AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) - fi -else - AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL],false) -fi - dnl Debug mode AC_ARG_ENABLE([debug], @@ -401,7 +352,7 @@ AC_ARG_ENABLE([nautilus], esac]) if test "$enable_nautilus" = "yes" ; then - PKG_CHECK_MODULES([NAUTILUS],[gtk+-x11-$GTK_API_VERSION $MM gthread-2.0 libnautilus-extension], + PKG_CHECK_MODULES([NAUTILUS],[gtk+-x11-3.0 $MM gthread-2.0 libnautilus-extension >= $NAUTILUS_REQUIRED], [],[AC_MSG_ERROR([libnautilus-extension not found; use --disable-nautilus to disable the nautilus extensions])]) NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension` AC_SUBST([nautilusextensiondir],[$NAUTILUS_EXTENSION_DIR]) @@ -440,7 +391,7 @@ AC_ARG_ENABLE([previewer], esac]) if test x$enable_previewer = "xyes" ; then - PKG_CHECK_MODULES([PREVIEWER],[gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED]) + PKG_CHECK_MODULES([PREVIEWER],[gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED]) fi AM_CONDITIONAL([ENABLE_PREVIEWER],[test "$enable_previewer" = "yes"]) @@ -503,16 +454,10 @@ AC_ARG_ENABLE([pdf], [enable_pdf=yes]) if test "x$enable_pdf" = "xyes"; then - POPPLER_REQUIRED=0.14.0 + POPPLER_REQUIRED=0.16.0 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) - AC_CHECK_FUNCS(poppler_page_get_selected_text) - AC_CHECK_FUNCS(poppler_page_add_annot) - 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]) @@ -653,22 +598,6 @@ AM_CONDITIONAL(WITH_TYPE1_FONTS, test x$enable_type1_fonts = xyes) dnl ================== End of dvi checks =================================================== -dnl ================== pixbuf checks =================================================== - -AC_ARG_ENABLE(pixbuf, - [AS_HELP_STRING([--enable-pixbuf], - [Compile with support of pixbuf])], - [enable_pixbuf=$enableval], - [enable_pixbuf=no]) - -if test "x$enable_pixbuf" = "xyes"; then - AC_DEFINE([ENABLE_PIXBUF], [1], [Enable pixbuf support.]) -fi - -AM_CONDITIONAL(ENABLE_PIXBUF, test x$enable_pixbuf = xyes) - -dnl ================== End of pixbuf checks =================================================== - dnl ================== comic book checks =================================================== AC_ARG_ENABLE(comics, @@ -684,25 +613,34 @@ 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]) -dnl ================== End of impress book checks ============================================ +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 XPS checks =================================================== dnl =================== Mime types list ==================================================== if test "x$enable_pdf" = "xyes" ; then - EVINCE_MIME_TYPES="application/pdf;application/x-bzpdf;application/x-gzpdf;" + EVINCE_MIME_TYPES="application/pdf;application/x-bzpdf;application/x-gzpdf;application/x-xzpdf;" fi if test "x$enable_ps" = "xyes" ; then EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/postscript;application/x-bzpostscript;application/x-gzpostscript;image/x-eps;image/x-bzeps;image/x-gzeps;" @@ -719,11 +657,8 @@ fi if test "x$enable_comics" = "xyes"; then EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES}application/x-cbr;application/x-cbz;application/x-cb7;application/x-cbt;" 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) @@ -764,7 +699,7 @@ AM_CONDITIONAL(ENABLE_HELP, test "x$enable_help" = "xyes") GTK_DOC_CHECK([1.13],[--flavour no-tmpl]) AC_SUBST([GLIB_PREFIX],[$($PKG_CONFIG --variable=prefix glib-2.0)]) -AC_SUBST([GTK_PREFIX],[$($PKG_CONFIG --variable=prefix gtk+-$GTK_API_VERSION)]) +AC_SUBST([GTK_PREFIX],[$($PKG_CONFIG --variable=prefix gtk+-3.0)]) # ****************** # Backends directory @@ -799,11 +734,10 @@ 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 @@ -832,8 +766,9 @@ data/icons/32x32/mimetypes/Makefile data/icons/48x48/Makefile data/icons/48x48/apps/Makefile data/icons/48x48/actions/Makefile +data/icons/256x256/Makefile +data/icons/256x256/apps/Makefile data/icons/scalable/Makefile -data/icons/scalable/apps/Makefile data/icons/scalable/actions/Makefile data/icons/scalable/mimetypes/Makefile help/Makefile @@ -865,8 +800,6 @@ AC_OUTPUT echo " Configure summary: Platform...........: $with_platform - GTK+ version.......: $with_gtk - GConf Support......: $with_gconf GTK+ Unix Print....: $with_gtk_unix_print Keyring Support....: $with_keyring DBUS Support.......: $enable_dbus @@ -885,7 +818,6 @@ Configure summary: TIFF Backend.......: $enable_tiff DJVU Backend.......: $enable_djvu DVI Backend........: $enable_dvi - Pixbuf Backend.....: $enable_pixbuf Comics Backend.....: $enable_comics - Impress Backend....: $enable_impress + XPS Backend........: $enable_xps "