X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=configure.ac;h=7d735187dc45e8bff14e1aaed02bd19e919b0554;hp=2426c2f5e2a7549589b6ceb6406792e4dcb6152e;hb=34e8fc1344c5433be1a9d8f8614cdb84933a84fb;hpb=166785e324a397f3b1444820102a41413041d76d

diff --git a/configure.ac b/configure.ac
index 2426c2f5..7d735187 100644
--- 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], [4])
-m4_define([empathy_nano_version], [0])
+m4_define([empathy_micro_version], [5])
+m4_define([empathy_nano_version], [1])
 
 dnl Display the nano_version only if it's not '0'
 m4_define([empathy_base_version],
@@ -25,12 +25,13 @@ AC_INIT(Empathy, empathy_version, http://bugzilla.gnome.org/browse.cgi?product=e
 AC_PREREQ(2.59)
 AC_COPYRIGHT([
   Copyright (C) 2003-2007 Imendio AB
-  Copyright (C) 2007-2008 Collabora Ltd.
+  Copyright (C) 2007-2010 Collabora Ltd.
 ])
 
 # Minimal version required
 
 # Hardp deps
+FOLKS_REQUIRED=0.1.11
 GCONF_REQUIRED=1.2.0
 GLIB_REQUIRED=2.25.9
 GTK_REQUIRED=2.21.2
@@ -38,6 +39,7 @@ KEYRING_REQUIRED=2.22
 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.7
 TELEPATHY_LOGGER=0.1.2
 UNIQUE_REQUIRED=1.1.2
@@ -50,6 +52,7 @@ ISO_CODES_REQUIRED=0.35
 LIBCHAMPLAIN_GTK_REQUIRED=0.4
 LIBCHAMPLAIN_REQUIRED=0.4
 NAUTILUS_SENDTO_REQUIRED=2.28.1
+NAUTILUS_SENDTO_REQUIRED_GTK3=2.90.0
 NETWORK_MANAGER_REQUIRED=0.7.0
 WEBKIT_REQUIRED=1.1.15
 
@@ -86,8 +89,6 @@ AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool)
 GLIB_GSETTINGS
 GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
 AC_SUBST(GLIB_GENMARSHAL)
-CONTROL_CENTER_EXTENSIONDIR=`$PKG_CONFIG --variable=extensiondir libgnome-control-center-extension`
-AC_SUBST(CONTROL_CENTER_EXTENSIONDIR)
 
 AC_CHECK_PROGS([XSLTPROC], [xsltproc])
 if test -z "$XSLTPROC"; then
@@ -145,6 +146,8 @@ PKG_CHECK_MODULES(EMPATHY,
 [
    dbus-glib-1
    farsight2-0.10
+   folks >= $FOLKS_REQUIRED
+   folks-telepathy >= $FOLKS_REQUIRED
    gconf-2.0 >= $GCONF_REQUIRED
    gio-2.0 >= $GLIB_REQUIRED
    gio-unix-2.0 >= $GLIB_REQUIRED
@@ -154,7 +157,7 @@ PKG_CHECK_MODULES(EMPATHY,
    gstreamer-interfaces-0.10
    libebook-1.2
    libxml-2.0
-   telepathy-farsight
+   telepathy-farsight >= $TELEPATHY_FARSIGHT_REQUIRED
    telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
    telepathy-logger-0.1 >= $TELEPATHY_LOGGER
    x11
@@ -170,29 +173,35 @@ AC_ARG_ENABLE(gtk3,
 
 # Try to use GTK+3 if available
 if test "x$enable_gtk3" != "xno"; then
-  PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= $GTK_REQUIRED],
-      enable_gtk3="yes", enable_gtk3="no")
+   PKG_CHECK_MODULES(GTK,
+   [
+      gtk+-3.0 >= $GTK_REQUIRED
+   ], have_gtk3="yes", have_gtk3="no")
+else
+   have_gtk3="no"
+fi
 
-  # GTK3 specific deps
-  PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED)
-  PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED_GTK3)
-  PKG_CHECK_MODULES(UNIQUE, unique-3.0 >= $UNIQUE_REQUIRED)
+if test "x$enable_gtk3" = "xyes" -a "x$have_gtk3" != "xyes"; then
+   AC_MSG_ERROR([Could not find gtk3 dependencies.])
 fi
 
-# ...if not use GTK+2
-if test "x$enable_gtk3" == "xno"; then
-  enable_gtk3=no
-  PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
+if test "x$have_gtk3" == "xyes"; then
+   # GTK3 specific deps
+   PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED)
+   PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED_GTK3)
+   PKG_CHECK_MODULES(UNIQUE, unique-3.0 >= $UNIQUE_REQUIRED)
+else
+   PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
 
-  # GTK2 specific deps
-  PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED)
-  PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
-  PKG_CHECK_MODULES(UNIQUE, unique-1.0 >= $UNIQUE_REQUIRED)
+   # GTK2 specific deps
+   PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED)
+   PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
+   PKG_CHECK_MODULES(UNIQUE, unique-1.0 >= $UNIQUE_REQUIRED)
 
-  # Enable GSEAL checks if needed
-  if test $USE_MAINTAINER_MODE = yes; then
-    AC_DEFINE(GSEAL_ENABLE, [], [Seal public structs to force usage of accessors])
-  fi
+   # Enable GSEAL checks if needed
+   if test $USE_MAINTAINER_MODE = yes; then
+      AC_DEFINE(GSEAL_ENABLE, [], [Seal public structs to force usage of accessors])
+   fi
 fi
 
 # -----------------------------------------------------------
@@ -230,6 +239,7 @@ if test "x$with_connectivity" = "xno"; then
    have_connman=no
 
 elif test "x$with_connectivity" = "xconnman"; then
+   have_nm=no
 
    PKG_CHECK_MODULES(CONNMAN,
    [
@@ -238,29 +248,18 @@ elif test "x$with_connectivity" = "xconnman"; then
 
    if test "x$have_connman" = "xyes"; then
       AC_DEFINE(HAVE_CONNMAN, 1, [Define if you have connman dependencies])
-      have_nm=no
    fi
 
 else
+   have_connman=no
 
    PKG_CHECK_MODULES(NETWORK_MANAGER,
    [
-      libnm_glib >= $NETWORK_MANAGER_REQUIRED
+      libnm-glib >= $NETWORK_MANAGER_REQUIRED
    ], have_nm="yes", have_nm="no")
 
    if test "x$have_nm" = "xyes"; then
       AC_DEFINE(HAVE_NM, 1, [Define if you have libnm-glib])
-      have_connman=no
-   else
-      PKG_CHECK_MODULES(NETWORK_MANAGER,
-      [
-          libnm-glib >= $NETWORK_MANAGER_REQUIRED
-      ], have_nm="yes", have_nm="no")
-
-      if test "x$have_nm" = "xyes"; then
-      AC_DEFINE(HAVE_NM, 1, [Define if you have libnm-glib])
-      have_connman=no
-      fi
    fi
 fi
 
@@ -285,7 +284,7 @@ AC_ARG_ENABLE(webkit,
 
 if test "x$enable_webkit" != "xno"; then
 
-   if test "x$enable_gtk3" == "xno"; then
+   if test "x$have_gtk3" == "xno"; then
       PKG_CHECK_MODULES(WEBKIT, [webkit-1.0 >= $WEBKIT_REQUIRED],
           have_webkit="yes", have_webkit="no")
    else
@@ -301,7 +300,7 @@ else
 fi
 
 if test "x$enable_webkit" = "xyes" -a "x$have_webkit" != "xyes"; then
-   AC_MSG_ERROR([Couldn't find webkit dependencies.])
+   AC_MSG_ERROR([Could not find webkit dependencies.])
 fi
 AM_CONDITIONAL(HAVE_WEBKIT, test "x$have_webkit" = "xyes")
 
@@ -338,7 +337,7 @@ else
 fi
 
 if test "x$enable_spell" = "xyes" -a "x$have_enchant" != "xyes"; then
-   AC_MSG_ERROR([Couldn't find spell dependencies.])
+   AC_MSG_ERROR([Could not find spell dependencies.])
 fi
 
 AM_CONDITIONAL(HAVE_ENCHANT, test "x$have_enchant" = "xyes")
@@ -353,7 +352,7 @@ AC_ARG_ENABLE(map,
 
 if test "x$enable_map" != "xno"; then
 
-   if test "x$enable_gtk3" == "xno"; then
+   if test "x$have_gtk3" == "xno"; then
       PKG_CHECK_MODULES(LIBCHAMPLAIN,
       [
          champlain-0.4 >= $LIBCHAMPLAIN_REQUIRED,
@@ -361,6 +360,7 @@ if test "x$enable_map" != "xno"; then
          clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
       ], have_libchamplain="yes", have_libchamplain="no")
    else
+      # FIXME: check deps once clutter-gtk and champlain have been ported to GTK3
       have_libchamplain="no"
    fi
 
@@ -368,12 +368,11 @@ if test "x$enable_map" != "xno"; then
       AC_DEFINE(HAVE_LIBCHAMPLAIN, 1, [Define if you have libchamplain])
    fi
 else
-   # FIXME: check deps once clutter-gtk and champlain have been ported to GTK3
    have_libchamplain=no
 fi
 
 if test "x$enable_map" = "xyes" -a "x$have_libchamplain" != "xyes"; then
-   AC_MSG_ERROR([Couldn't find map view dependencies.])
+   AC_MSG_ERROR([Could not find map view dependencies.])
 fi
 
 AM_CONDITIONAL(HAVE_LIBCHAMPLAIN, test "x$have_libchamplain" = "xyes")
@@ -400,7 +399,7 @@ else
 fi
 
 if test "x$enable_location" = "xyes" -a "x$have_geoclue" != "xyes"; then
-   AC_MSG_ERROR([Couldn't find location dependencies.])
+   AC_MSG_ERROR([Could not find location dependencies.])
 fi
 
 AM_CONDITIONAL(HAVE_GEOCLUE, test "x$have_geoclue" = "xyes")
@@ -429,7 +428,7 @@ else
 fi
 
 if test "x$enable_meego" = "xyes" -a "x$have_meego" != "xyes"; then
-   AC_MSG_ERROR([Couldn't find meego dependencies.])
+   AC_MSG_ERROR([Could not find meego dependencies.])
 fi
 
 AM_CONDITIONAL(HAVE_MEEGO, test "x$have_meego" = "xyes")
@@ -445,16 +444,27 @@ AC_ARG_ENABLE(nautilus-sendto,
                              enable_nautilus_sendto=auto)
 
 if test "x$enable_nautilus_sendto" != "xno"; then
-   PKG_CHECK_MODULES(NST,
-   [
-      nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED
-   ], have_nst="yes", have_nst="no")
+   if test "x$have_gtk3" == "xno"; then
+      # Newer NST requires GTK+3 so we can't use it
+      PKG_CHECK_MODULES(NST,
+      [
+         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,
+      [
+         nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED_GTK3
+      ], have_nst="yes", have_nst="no")
+   fi
 else
    have_nst=no
 fi
 
 if test "x$enable_nautilus_sendto" = "xyes" -a "x$have_nst" != "xyes"; then
-   AC_MSG_ERROR([Couldn't find nautilus-sendto dependencies.])
+   AC_MSG_ERROR([Could not find nautilus-sendto dependencies.])
 fi
 
 AM_CONDITIONAL(HAVE_NST, test "x$have_nst" = "xyes")
@@ -470,18 +480,27 @@ AC_ARG_ENABLE(control_center_embedding,
 if test "x$enable_control_center_embedding" != "xno"; then
    PKG_CHECK_MODULES(CONTROL_CENTER_EMBEDDING,
    [
-      libgnome-control-center-extension
+      libgnome-control-center
    ], have_control_center_embedding="yes", have_control_center_embedding="no")
 
    if test "x$have_control_center_embedding" = "xyes"; then
       AC_DEFINE(HAVE_CONTROL_CENTER_EMBEDDING, 1, [Define if you have the single-window control center])
+
+      AC_MSG_CHECKING([gnome-control-center extension dir])
+      CONTROL_CENTER_EXTENSIONDIR=`$PKG_CONFIG --variable=extensiondir libgnome-control-center`
+      if test "x$CONTROL_CENTER_EXTENSIONDIR" = "x"; then
+          AC_MSG_ERROR([Could not determine extensiondir])
+      else
+          AC_MSG_RESULT([$CONTROL_CENTER_EXTENSIONDIR])
+      fi
+      AC_SUBST(CONTROL_CENTER_EXTENSIONDIR)
    fi
 else
    have_control_center_embedding="no"
 fi
 
 if test "x$enable_control_center_embedding" = "xyes" -a "x$have_control_center_embedding" != "xyes"; then
-   AC_MSG_ERROR([Couldn't find single-window control center dependencies.])
+   AC_MSG_ERROR([Could not find single-window control center dependencies.])
 fi
 
 AM_CONDITIONAL(HAVE_CONTROL_CENTER_EMBEDDING, test "x$have_control_center_embedding" = "xyes")
@@ -493,7 +512,7 @@ AC_SUBST(CONTROL_CENTER_EMBEDDING_LIBS)
 # -----------------------------------------------------------
 AC_ARG_ENABLE(coding-style-checks,
   AC_HELP_STRING([--disable-coding-style-checks],
-                 [don't check coding style using grep]),
+                 [do not check coding style using grep]),
     [ENABLE_CODING_STYLE_CHECKS=$enableval], [ENABLE_CODING_STYLE_CHECKS=yes])
 
 AC_SUBST([ENABLE_CODING_STYLE_CHECKS])
@@ -525,7 +544,7 @@ Configure summary:
 	Compiler Flags..............:  ${CFLAGS} ${ERROR_CFLAGS}
 	Prefix......................:  ${prefix}
 	Coding style checks.........:  ${ENABLE_CODING_STYLE_CHECKS}
-	Use GTK+3...................:  ${enable_gtk3}
+	Use GTK+3...................:  ${have_gtk3}
 
     Features:
 	Spell checking (enchant)....:  ${have_enchant}