1 files changed, 33 insertions, 29 deletions
diff --git a/configure.ac b/configure.ac
index 8a57e361..cd734add 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 # *****************************************************************************
 
 m4_define([ev_major_version], [1])
-m4_define([ev_minor_version], [25])
+m4_define([ev_minor_version], [28])
 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])
@@ -40,7 +40,13 @@ m4_define([ev_binary_version], [ev_document_lt_current])
 # *****************************************************************************
 
 AC_PREREQ([2.57])
-AC_INIT([atril], [ev_version], [https://mate-desktop.org/], [atril])
+
+AC_INIT([atril],
+ [ev_version],
+ [https://github.com/mate-desktop/atril/issues],
+ [atril],
+ [https://mate-desktop.org])
+
 AM_INIT_AUTOMAKE([1.10 foreign tar-ustar dist-xz no-dist-gzip check-news])
 
 AC_CONFIG_HEADERS([config.h])
@@ -68,11 +74,12 @@ dnl FIXME: remove this when required gtk+ >= 2.19.7
 DISABLE_DEPRECATED=
 AC_SUBST([DISABLE_DEPRECATED])
 
+AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION([0.19.8])
 AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8])
-AM_GNU_GETTEXT([external])
+AM_CONDITIONAL([USE_NLS], [test "x${USE_NLS}" = "xyes"])
 
-GETTEXT_PACKAGE=atril
+GETTEXT_PACKAGE=AC_PACKAGE_NAME
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext package])
 
@@ -84,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
@@ -105,13 +113,17 @@ dnl Check dependencies
 
 AC_SEARCH_LIBS([hypot],[m])
 
+PKG_CHECK_MODULES(GLIB, glib-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)
 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)
 
 # ***************
 # Build utilities
@@ -569,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)
 
@@ -611,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
@@ -717,31 +738,10 @@ cut-n-paste/smclient/Makefile
 cut-n-paste/smclient/libegg/Makefile
 cut-n-paste/toolbar-editor/Makefile
 cut-n-paste/zoom-control/Makefile
+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
@@ -772,6 +772,9 @@ AC_OUTPUT
 echo "
 Configure summary:
 
+ ${PACKAGE_STRING}
+ `echo $PACKAGE_STRING | sed "s/./=/g"`
+
 prefix..............: ${prefix}
 compiler............: ${CC}
 cflags..............: ${CFLAGS}
@@ -786,6 +789,7 @@ Configure summary:
 Gtk-Doc Support.....: $enable_gtk_doc
 Debug mode..........: $enable_debug
 GObj. Introspection.: $enable_introspection
+ Use NLS.............: ${USE_NLS}
 Tests...............: $enable_tests
 
 PDF Backend.........: $enable_pdf