From 1d16b37f4e8a0689661a95ecd8dc8ac0ef472829 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Tue, 4 Jan 2011 02:11:41 +0000
Subject: [PATCH] correctly init e_hal here only when it is used as the device
 backend

SVN revision: 55834
---
 configure.ac       | 2 ++
 src/bin/e_msgbus.c | 8 ++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 463454a2b..4f255559f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -302,6 +302,8 @@ else
 fi
 AC_MSG_RESULT($device_backend)
 AM_CONDITIONAL([HAVE_EEZE], [test "x${device_backend}" = "xeeze"])
+test "x${device_backend}" = "xeeze" || AC_DEFINE_UNQUOTED([HAVE_HAL],[1],[enable HAL support])
+
 
 DBUS_MOUNT_CONFIG=1
 dbus_mount="dbus-1"
diff --git a/src/bin/e_msgbus.c b/src/bin/e_msgbus.c
index 69ae909ab..d91a81678 100644
--- a/src/bin/e_msgbus.c
+++ b/src/bin/e_msgbus.c
@@ -30,9 +30,7 @@ e_msgbus_init(void)
    _e_msgbus_data = E_NEW(E_Msgbus_Data, 1);
 
    e_dbus_init();
-#ifdef HAVE_EUKIT
-   e_ukit_init();
-#else
+#ifdef HAVE_HAL
    e_hal_init();
 #endif
 
@@ -104,9 +102,7 @@ e_msgbus_shutdown(void)
      {
         e_dbus_connection_close(_e_msgbus_data->conn);
      }
-#ifdef HAVE_EUKIT
-   e_ukit_shutdown();
-#else
+#ifdef HAVE_HAL
    e_hal_shutdown();
 #endif
    e_dbus_shutdown();