Find out which dbus version we use

Also correct check for dbus_watch_get_unix_fd, spotted by Shane McGuire

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/e_dbus@45749 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/configure.ac b/configure.ac
index 10cac98..ba97cdd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -79,6 +79,25 @@ PKG_CHECK_MODULES([EDBUS], [
   ecore >= 0.9.9
 ])
 
+##### Find out the version of DBUS we're using
+dbus_version=`pkg-config --modversion dbus-1`
+DBUS_VERSION_MAJOR=`echo $dbus_version | awk -F. '{print $1}'`
+DBUS_VERSION_MINOR=`echo $dbus_version | awk -F. '{print $2}'`
+DBUS_VERSION_MICRO=`echo $dbus_version | awk -F. '{print $3}'`
+if test "z$DBUS_VERSION_MAJOR" = "z"; then
+  DBUS_VERSION_MAJOR="0"
+fi
+if test "z$DBUS_VERSION_MINOR" = "z"; then
+  DBUS_VERSION_MINOR="0"
+fi
+if test "z$DBUS_VERSION_MICRO" = "z"; then
+  DBUS_VERSION_MICRO="0"
+fi
+DBUS_VERSION_CFLAGS="$DBUS_VERSION_CFLAGS -DDBUS_VERSION_MAJOR=$DBUS_VERSION_MAJOR"
+DBUS_VERSION_CFLAGS="$DBUS_VERSION_CFLAGS -DDBUS_VERSION_MINOR=$DBUS_VERSION_MINOR"
+DBUS_VERSION_CFLAGS="$DBUS_VERSION_CFLAGS -DDBUS_VERSION_MICRO=$DBUS_VERSION_MICRO"
+AC_SUBST(DBUS_VERSION_CFLAGS)
+
 AC_FUNC_ALLOCA
 
 dnl evas

diff --git a/src/lib/dbus/Makefile.am b/src/lib/dbus/Makefile.am
index 3ed559d..b56865b 100644 (file)
--- a/src/lib/dbus/Makefile.am
+++ b/src/lib/dbus/Makefile.am
@@ -3,7 +3,9 @@ MAINTAINERCLEANFILES = Makefile.in
 AM_CPPFLAGS = \
 @EFL_EDBUS_BUILD@ \
 @EDBUS_CFLAGS@ \
-@EINA_CFLAGS@
+@EINA_CFLAGS@ \
+@DBUS_VERSION_CFLAGS@
+
 
 lib_LTLIBRARIES = libedbus.la
 include_HEADERS = E_DBus.h
@@ -21,4 +23,4 @@ e_dbus_signal.c
 libedbus_la_LIBADD = @EDBUS_LIBS@ @EINA_LIBS@
 libedbus_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @edbus_release_info@
 
-EXTRA_DIST = e_dbus_private.h
\ No newline at end of file
+EXTRA_DIST = e_dbus_private.h

diff --git a/src/lib/dbus/e_dbus.c b/src/lib/dbus/e_dbus.c
index 6607cf9..89e5586 100644 (file)
--- a/src/lib/dbus/e_dbus.c
+++ b/src/lib/dbus/e_dbus.c
@@ -127,7 +127,7 @@ e_dbus_connection_data_watch_add(E_DBus_Connection *cd, DBusWatch *watch)
   hd->watch = watch;
 
   hd->enabled = dbus_watch_get_enabled(watch);
-#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO>= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1)
+#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO>= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR > 1) || (DBUS_VERSION_MAJOR > 1)
   hd->fd = dbus_watch_get_unix_fd(hd->watch);
 #else
   hd->fd = dbus_watch_get_fd(hd->watch);