X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=configure.ac;h=6085e9b359903988edfb7cd19aef635bbb7f444b;hp=df9b16cc787367e20ccc311225732f76aa0b41ee;hb=f04b86652a33b9182e04b20efe4be4fa35789e8a;hpb=d5c310f183d31c529f26d31ef79ac7e02662d4ee

diff --git a/configure.ac b/configure.ac
index df9b16cc..6085e9b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ m4_define(empathy_released, 0)
 
 m4_define([empathy_major_version], [2])
 m4_define([empathy_minor_version], [29])
-m4_define([empathy_micro_version], [2])
+m4_define([empathy_micro_version], [4])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
@@ -30,7 +30,7 @@ AC_COPYRIGHT([
 
 # Minimal version required
 GLIB_REQUIRED=2.22.0
-GTK_REQUIRED=2.16.0
+GTK_REQUIRED=2.18.0
 GCONF_REQUIRED=1.2.0
 TELEPATHY_GLIB_REQUIRED=0.9.0
 ENCHANT_REQUIRED=1.2.0
@@ -44,15 +44,15 @@ GEOCLUE_REQUIRED=0.11
 WEBKIT_REQUIRED=1.1.15
 KEYRING_REQUIRED=2.22
 NETWORK_MANAGER_REQUIRED=0.7.0
-NAUTILUS_SENDTO_REQUIRED=2.28.0.1
+NAUTILUS_SENDTO_REQUIRED=2.28.1
 
 # Use --enable-maintainer-mode to disabled deprecated symbols
 GNOME_MAINTAINER_MODE_DEFINES
 
-# Uncomment that to build with single include disabled
-#AC_DEFINE(G_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GLib])
-#AC_DEFINE(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GDK pixbuf])
-#AC_DEFINE(GTK_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GTK])
+# Warning if GLib/GDK/GTK headers are included
+AC_DEFINE(G_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GLib])
+AC_DEFINE(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GDK pixbuf])
+AC_DEFINE(GTK_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GTK])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
@@ -169,6 +169,7 @@ PKG_CHECK_MODULES(EMPATHY,
    dbus-glib-1
    telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
    telepathy-farsight
+   farsight2-0.10
    gstreamer-0.10
    unique-1.0
    gnome-keyring-1 >= $KEYRING_REQUIRED
@@ -232,6 +233,16 @@ else
    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
 
@@ -403,9 +414,9 @@ AC_SUBST(MOBLIN_LIBS)
 AC_ARG_ENABLE(nautilus-sendto,
               AS_HELP_STRING([--enable-nautilus-sendto=@<:@no/yes/auto@:>@],
                              [build nautilus-sendto plugin]), ,
-                             enable_nst=auto)
+                             enable_nautilus_sendto=auto)
 
-if test "x$enable_nst" != "xno"; then
+if test "x$enable_nautilus_sendto" != "xno"; then
    PKG_CHECK_MODULES(NST,
    [
       nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED
@@ -414,7 +425,7 @@ else
    have_nst=no
 fi
 
-if test "x$enable_nst" = "xyes" -a "x$have_nst" != "xyes"; then
+if test "x$enable_nautilus_sendto" = "xyes" -a "x$have_nst" != "xyes"; then
    AC_MSG_ERROR([Couldn't find nautilus-sendto dependencies.])
 fi