X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=configure.ac;h=952ff13cdf194e24be1a3b621c540ef2f63668be;hp=33340df12aa96dc146639b31f36462b2e1d892c1;hb=f3842fe890a0819331c3a5901437c88b2e88d282;hpb=2aa506e8a17ef67ddf43ee716b21afc780a9d0d2

diff --git a/configure.ac b/configure.ac
index 33340df1..952ff13c 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], [90])
+m4_define([empathy_micro_version], [92])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
@@ -33,6 +33,7 @@ GLIB_REQUIRED=2.22.0
 GTK_REQUIRED=2.18.0
 GCONF_REQUIRED=1.2.0
 TELEPATHY_GLIB_REQUIRED=0.9.2
+TELEPATHY_LOGGER=0.1.1
 ENCHANT_REQUIRED=1.2.0
 ISO_CODES_REQUIRED=0.35
 LIBNOTIFY_REQUIRED=0.4.4
@@ -134,6 +135,30 @@ AS_COMPILER_FLAG(-Wmissing-declarations, ERROR_CFLAGS="$ERROR_CFLAGS -Wmissing-d
 
 AC_SUBST(ERROR_CFLAGS)
 
+# -----------------------------------------------------------
+# Enable TPL
+# -----------------------------------------------------------
+
+# It needs to be defined before PKG_CHECK_MODULES calls
+AC_ARG_ENABLE(tpl,
+  AC_HELP_STRING([--enable-tpl],[enable telepathy-logger code and disable the
+    empathy logger]), enable_tpl=$enableval, enable_tpl=no )
+AM_CONDITIONAL(ENABLE_TPL, test "x$enable_tpl" = "xyes")
+
+if test x${enable_tpl} = xyes; then
+  AC_DEFINE(ENABLE_TPL, [], [Enable TPL code])
+fi
+
+if test "x$enable_tpl" = "xyes"; then
+  PKG_CHECK_MODULES(TPL,
+  [
+     telepathy-logger = $TELEPATHY_LOGGER
+  ])
+  AC_SUBST(TPL_CFLAGS)
+  AC_SUBST(TPL_LIBS)
+fi
+
+
 # -----------------------------------------------------------
 # Pkg-Config dependency checks
 # -----------------------------------------------------------
@@ -402,33 +427,62 @@ AC_SUBST(GEOCLUE_CFLAGS)
 AC_SUBST(GEOCLUE_LIBS)
 
 # -----------------------------------------------------------
-# moblin widgets support
+# meego widgets support
+# -----------------------------------------------------------
+AC_ARG_ENABLE(meego,
+              AS_HELP_STRING([--enable-meego=@<:no/yes@:>@],
+                             [Enable meego widgets]), ,
+                             enable_meego=no)
+
+if test "x$enable_meego" != "xno"; then
+    PKG_CHECK_MODULES(MEEGO,
+    [
+       mx-gtk-1.0
+    ], have_meego="yes", have_meego="no")
+
+    if test "x$have_meego" = "xyes"; then
+       AC_DEFINE(HAVE_MEEGO, 1, [Define if you have meego])
+       chain_enable_favourite_contacts="yes"
+    fi
+else
+   have_meego="no"
+fi
+
+if test "x$enable_meego" = "xyes" -a "x$have_meego" != "xyes"; then
+   AC_MSG_ERROR([Couldn't find meego dependencies.])
+fi
+
+AM_CONDITIONAL(HAVE_MEEGO, test "x$have_meego" = "xyes")
+AC_SUBST(MEEGO_CFLAGS)
+AC_SUBST(MEEGO_LIBS)
+
+# -----------------------------------------------------------
+# favourite contacts support
 # -----------------------------------------------------------
-AC_ARG_ENABLE(moblin,
-              AS_HELP_STRING([--enable-moblin=@<:no/yes@:>@],
-                             [Enable moblin widgets]), ,
-                             enable_moblin=no)
+AC_ARG_ENABLE(favourite_contacts,
+              AS_HELP_STRING([--enable-favourite-contacts=@<:no/yes@:>@],
+                             [Enable favourite contacts]), ,
+                             enable_favourite_contacts=no)
 
-if test "x$enable_moblin" != "xno"; then
-    PKG_CHECK_MODULES(MOBLIN,
+if test "x$enable_favourite_contacts" != "xno" -o "x$chain_enable_favourite_contacts" == "xyes"; then
+    PKG_CHECK_MODULES(TELEPATHY_LOGGER,
     [
-       nbtk-gtk-1.2
-    ], have_moblin="yes", have_moblin="no")
+       telepathy-logger
+    ], have_telepathy_logger="yes", have_telepathy_logger="no")
 
-    if test "x$have_moblin" = "xyes"; then
-       AC_DEFINE(HAVE_MOBLIN, 1, [Define if you have moblin])
+    if test "x$have_telepathy_logger" = "xyes"; then
+       have_favourite_contacts="yes"
+       AC_DEFINE(HAVE_FAVOURITE_CONTACTS, 1, [Define if you want favourite contacts support])
     fi
 else
-   have_moblin="no"
+   have_favourite_contacts="no"
 fi
 
-if test "x$enable_moblin" = "xyes" -a "x$have_moblin" != "xyes"; then
-   AC_MSG_ERROR([Couldn't find moblin dependencies.])
+if test "x$enable_favourite_contacts" = "xyes" -a "x$have_favourite_contacts" != "xyes"; then
+   AC_MSG_ERROR([Couldn't find favourite contacts dependencies.])
 fi
 
-AM_CONDITIONAL(HAVE_MOBLIN, test "x$have_moblin" = "xyes")
-AC_SUBST(MOBLIN_CFLAGS)
-AC_SUBST(MOBLIN_LIBS)
+AM_CONDITIONAL(HAVE_FAVOURITE_CONTACTS, test "x$have_telepathy_logger" = "xyes")
 
 # -----------------------------------------------------------
 # nautilus-sendto
@@ -525,9 +579,13 @@ Configure summary:
 	Display maps (libchamplain).:  ${have_libchamplain}
 	Location awareness (Geoclue):  ${have_geoclue}
 	Adium themes (Webkit).......:  ${have_webkit}
-	Moblin widgets .............:  ${have_moblin}
+	Meego widgets ..............:  ${have_meego}
+	Favourite contacts .........:  ${have_favourite_contacts}
 	Control center embedding....:  ${have_control_center_embedding}
 
+    Logging:
+        Telepathy Logger............:  ${enable_tpl}
+
     Connectivity:
 	NetworkManager integration..:  ${have_nm}
 	ConnMan integration.........:  ${have_connman}