nautilus-sendto-plugin: depend on 2.31.7 when building with GTK+2

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 97ea195ff335cc52683dece27d30af70e3d85af9..48dd5ea48fdd999f2ad3a7e73724f2217ece722d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@ m4_define(empathy_released, 0)
 
 m4_define([empathy_major_version], [2])
 m4_define([empathy_minor_version], [31])
-m4_define([empathy_micro_version], [6])
-m4_define([empathy_nano_version], [1])
+m4_define([empathy_micro_version], [90])
+m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
 m4_define([empathy_base_version],
@@ -31,16 +31,17 @@ AC_COPYRIGHT([
 # Minimal version required
 
 # Hardp deps
-FOLKS_REQUIRED=0.1.13
+FOLKS_REQUIRED=0.1.15
 GCONF_REQUIRED=1.2.0
 GLIB_REQUIRED=2.25.9
+GNUTLS_REQUIRED=2.8.5
 GTK_REQUIRED=2.21.2
 KEYRING_REQUIRED=2.26.0
 LIBCANBERRA_GTK_REQUIRED=0.4
 LIBNOTIFY_REQUIRED=0.4.4
 LIBNOTIFY_REQUIRED_GTK3=0.5.1
 TELEPATHY_FARSIGHT_REQUIRED=0.0.14
-TELEPATHY_GLIB_REQUIRED=0.11.12
+TELEPATHY_GLIB_REQUIRED=0.11.13
 TELEPATHY_LOGGER=0.1.5
 UNIQUE_REQUIRED=1.1.2
 
@@ -49,9 +50,9 @@ CLUTTER_GTK_REQUIRED=0.10
 ENCHANT_REQUIRED=1.2.0
 GEOCLUE_REQUIRED=0.11
 ISO_CODES_REQUIRED=0.35
-LIBCHAMPLAIN_GTK_REQUIRED=0.4
-LIBCHAMPLAIN_REQUIRED=0.4
-NAUTILUS_SENDTO_REQUIRED=2.28.1
+LIBCHAMPLAIN_GTK_REQUIRED=0.7.1
+LIBCHAMPLAIN_REQUIRED=0.7.1
+NAUTILUS_SENDTO_REQUIRED=2.31.7
 NAUTILUS_SENDTO_REQUIRED_GTK3=2.90.0
 NETWORK_MANAGER_REQUIRED=0.7.0
 WEBKIT_REQUIRED=1.1.15
@@ -154,11 +155,11 @@ PKG_CHECK_MODULES(EMPATHY,
    gio-2.0 >= $GLIB_REQUIRED
    gio-unix-2.0 >= $GLIB_REQUIRED
    gnome-keyring-1 >= $KEYRING_REQUIRED
-   gnutls
+   gnutls >= $GNUTLS_REQUIRED
+   gmodule-export-2.0
    gobject-2.0
    gstreamer-0.10
    gstreamer-interfaces-0.10
-   libebook-1.2
    libxml-2.0
    telepathy-farsight >= $TELEPATHY_FARSIGHT_REQUIRED
    telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
@@ -166,6 +167,17 @@ PKG_CHECK_MODULES(EMPATHY,
    x11
 ])
 
+# -----------------------------------------------------------
+# evolution-data-server (about-me)
+# -----------------------------------------------------------
+AC_ARG_WITH(eds,
+            AC_HELP_STRING([--with-eds], [build with evolution-data-server support]),,
+            [with_eds=yes])
+if test x"$with_eds" = x"yes" ; then
+   PKG_CHECK_MODULES(EDS, [libebook-1.2])
+   AC_DEFINE(HAVE_EDS, 1, [Define if we have libebook])
+fi
+
 # -----------------------------------------------------------
 # GTK+
 # -----------------------------------------------------------
@@ -358,8 +370,8 @@ if test "x$enable_map" != "xno"; then
    if test "x$have_gtk3" == "xno"; then
       PKG_CHECK_MODULES(LIBCHAMPLAIN,
       [
-         champlain-0.4 >= $LIBCHAMPLAIN_REQUIRED,
-         champlain-gtk-0.4 >= $LIBCHAMPLAIN_GTK_REQUIRED
+         champlain-0.8 >= $LIBCHAMPLAIN_REQUIRED,
+         champlain-gtk-0.8 >= $LIBCHAMPLAIN_GTK_REQUIRED
          clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
       ], have_libchamplain="yes", have_libchamplain="no")
    else
@@ -454,8 +466,6 @@ if test "x$enable_nautilus_sendto" != "xno"; then
          nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED
          nautilus-sendto < 2.90.0
       ], have_nst="yes", have_nst="no")
-
-      AC_DEFINE(HAVE_OLD_NST, [], [Legacy compat mode with old nautilus-sendto] )
    else
       PKG_CHECK_MODULES(NST,
       [
@@ -567,4 +577,5 @@ Configure summary:
 
     Extras:
        Nautilus-sendto plugin......:  ${have_nst}
+       Salut E-D-S support.........:  ${with_eds}
 "