diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 44 |
1 files changed, 16 insertions, 28 deletions
diff --git a/configure.ac b/configure.ac index c2952c9f..65d1c05d 100644 --- a/configure.ac +++ b/configure.ac @@ -3,8 +3,8 @@ # ***************************************************************************** m4_define([ev_major_version], [1]) -m4_define([ev_minor_version], [25]) -m4_define([ev_micro_version], [1]) +m4_define([ev_minor_version], [28]) +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]) @@ -91,8 +91,9 @@ GLIB_GSETTINGS dnl Specify required versions of dependencies CAIRO_REQUIRED=1.14.0 -GLIB_REQUIRED=2.62.0 +GLIB_REQUIRED=2.54.0 GTK_REQUIRED=3.22.0 +MATE_DESKTOP_REQUIRED=1.27.1 WEBKIT_REQUIRED=2.6.0 LIBSECRET_REQUIRED=0.5 LIBXML_REQUIRED=2.5.0 @@ -119,7 +120,7 @@ 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) PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED) -PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0 x11]) +PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0 x11 mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED]) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) @@ -580,8 +581,11 @@ AC_ARG_ENABLE(comics, [enable_comics=$enableval], [enable_comics=yes]) +COMICS_DEPS="libarchive" if test "x$enable_comics" = "xyes"; then AC_DEFINE([ENABLE_COMICS], [1], [Enable support for comics.]) + PKG_CHECK_MODULES([COMICS], [$COMICS_DEPS]) + AC_SUBST(COMICS_LIBS) fi AM_CONDITIONAL(ENABLE_COMICS, test x$enable_comics = xyes) @@ -622,7 +626,13 @@ AC_ARG_ENABLE(epub, have_webkit="no" if test "x$enable_epub" = "xyes"; then - PKG_CHECK_MODULES(EPUB, webkit2gtk-4.0 >= $WEBKIT_REQUIRED \ + dnl select the available WebKit2Gtk4 version, with a preference towards 4.1 + webkit_pkg=webkit2gtk-4.1 + PKG_CHECK_EXISTS([$webkit_pkg >= $WEBKIT_REQUIRED], [], + [PKG_CHECK_EXISTS([webkit2gtk-4.0 >= $WEBKIT_REQUIRED], + [webkit_pkg=webkit2gtk-4.0])]) + + PKG_CHECK_MODULES(EPUB, $webkit_pkg >= $WEBKIT_REQUIRED \ libxml-2.0 >= $LIBXML_REQUIRED zlib,have_webkit=yes,have_webkit=no) if test "x$have_webkit" = "xyes"; then @@ -654,7 +664,7 @@ if test "x$enable_tiff" = "xyes"; then ATRIL_MIME_TYPES="${ATRIL_MIME_TYPES}image/tiff;" fi if test "x$enable_comics" = "xyes"; then - ATRIL_MIME_TYPES="${ATRIL_MIME_TYPES}application/x-cbr;application/x-cbz;application/x-cb7;application/x-cbt;application/vnd.comicbook+zip;application/vnd-comicbook.rar;" + ATRIL_MIME_TYPES="${ATRIL_MIME_TYPES}application/x-cbr;application/x-cbz;application/x-cb7;application/x-cbt;application/vnd.comicbook+zip;application/vnd.comicbook-rar;" fi if test "x$enable_pixbuf" = "xyes"; then ATRIL_MIME_TYPES="${ATRIL_MIME_TYPES}image/*;" @@ -732,28 +742,6 @@ data/atril.appdata.xml.in data/atril.desktop.in data/Makefile data/icons/Makefile -data/icons/16x16/Makefile -data/icons/16x16/apps/Makefile -data/icons/16x16/actions/Makefile -data/icons/16x16/mimetypes/Makefile -data/icons/22x22/Makefile -data/icons/22x22/apps/Makefile -data/icons/22x22/actions/Makefile -data/icons/22x22/mimetypes/Makefile -data/icons/24x24/Makefile -data/icons/24x24/apps/Makefile -data/icons/24x24/actions/Makefile -data/icons/24x24/mimetypes/Makefile -data/icons/32x32/Makefile -data/icons/32x32/actions/Makefile -data/icons/32x32/mimetypes/Makefile -data/icons/48x48/Makefile -data/icons/48x48/apps/Makefile -data/icons/48x48/actions/Makefile -data/icons/scalable/Makefile -data/icons/scalable/apps/Makefile -data/icons/scalable/actions/Makefile -data/icons/scalable/mimetypes/Makefile help/Makefile help/reference/Makefile help/reference/libdocument/Makefile |