X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=005b6758b12ced5a2beb6939b929a45bba2a2f0a;hb=690c43bf613d0c69579072f1cffb1898ef0b0856;hp=b3a42f95dac60d09c0ff89601873babbbd787ed6;hpb=eb3e783ab46d2034e2832c6ae86b8805023879d1;p=evince.git diff --git a/configure.ac b/configure.ac index b3a42f95..005b6758 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ m4_define([ev_major_version],[2]) m4_define([ev_minor_version],[91]) -m4_define([ev_micro_version],[4]) +m4_define([ev_micro_version],[90]) m4_define([ev_extra_version],[]) m4_define([ev_version],[ev_major_version.ev_minor_version.ev_micro_version()ev_extra_version]) @@ -125,7 +125,8 @@ dnl Specify required versions of dependencies CAIRO_REQUIRED=1.10.0 GLIB_REQUIRED=2.25.11 KEYRING_REQUIRED=2.22.0 -GTK_REQUIRED=2.91.7 +GTK_REQUIRED=3.0.0 +NAUTILUS_REQUIRED=2.91.4 AC_SUBST([GLIB_REQUIRED]) AC_SUBST([GTK_REQUIRED]) @@ -200,7 +201,7 @@ 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 @@ -351,7 +352,7 @@ AC_ARG_ENABLE([nautilus], esac]) if test "$enable_nautilus" = "yes" ; then - PKG_CHECK_MODULES([NAUTILUS],[gtk+-x11-3.0 $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])