elm now supports edbus v2, deprecated v1 function.

v1 is now deprecated (EINA_DEPRECATED) but still there, should still
work and not break any existing app.

v2 is now there as well, all software is being ported to use it
now. Just Enlightenment itself will still ship with v1 and as soon as
we release it will go v2, we have the patches here.



SVN revision: 80110

1 files changed, 29 insertions, 1 deletions

diff --git a/configure.ac b/configure.ac
index 751c4a306..4326fdfae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -497,6 +497,34 @@ if test "x$want_elementary_edbus" = "xyes" -a "x$have_elementary_edbus" = "xno";
 fi
 AC_SUBST(ELM_EDBUS_DEF)
 
+ELM_EDBUS2_DEF="#undef"
+have_elementary_edbus2="no"
+want_elementary_edbus2="auto"
+AC_ARG_ENABLE([edbus2],
+   [AC_HELP_STRING([--disable-edbus2], [disable edbus2 support. @<:@default=detect@:>@])],
+   [want_elementary_edbus2=$enableval], [])
+
+if test "x$want_elementary_edbus2" != "xno"; then
+    PKG_CHECK_MODULES([ELEMENTARY_EDBUS2],
+       [
+        edbus2 >= 1.7.99
+       ],
+       [
+        AC_DEFINE(HAVE_ELEMENTARY_EDBUS2, 1, [EDbus2 support for Elementary])
+        have_elementary_edbus2="yes"
+        ELM_EDBUS2_DEF="#define"
+        requirement_elm="edbus2 >= 1.7.99 ${requirement_elm}"
+       ],
+       [have_elementary_edbus2="no"]
+    )
+else
+    have_elementary_edbus2="no"
+fi
+if test "x$want_elementary_edbus2" = "xyes" -a "x$have_elementary_edbus2" = "xno"; then
+    AC_MSG_ERROR([EDBus (v2) support requested, but no edbus2 found by pkg-config.])
+fi
+AC_SUBST(ELM_EDBUS2_DEF)
+
 ELM_EFREET_DEF="#undef"
 have_elementary_efreet="no"
 want_elementary_efreet="auto"
@@ -814,7 +842,7 @@ echo
 echo "  Features:"
 echo "    Ecore_IMF..............: ${have_ecore_imf}"
 echo "    Ecore_Con..............: ${have_ecore_con}"
-echo "    EDBus..................: ${have_elementary_edbus}"
+echo "    EDBus..................: v1=${have_elementary_edbus}, v2=${have_elementary_edbus2}"
 echo "    EFreet.................: ${have_elementary_efreet}"
 echo "    EWeather...............: ${have_elementary_eweather}"
 echo "    EMap...................: ${have_elementary_emap}"