From a1905a6937bf6e8855660410ba3f7bab9f415449 Mon Sep 17 00:00:00 2001
From: Zdenek Prikryl <zprikryl@redhat.com>
Date: Thu, 11 Jun 2009 13:05:04 +0200
Subject: added new options to AT, which defines what communication platform
 will be used

---
 src/Daemon/CrashWatcher.cpp | 8 ++++----
 src/Daemon/CrashWatcher.h   | 6 +++---
 src/Daemon/Makefile.am      | 3 ++-
 3 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/Daemon')

diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp
index 9dd4232..97d03b5 100644
--- a/src/Daemon/CrashWatcher.cpp
+++ b/src/Daemon/CrashWatcher.cpp
@@ -381,13 +381,13 @@ CCrashWatcher::CCrashWatcher(const std::string& pPath)
     SetUpMW();
     SetUpCron();
     FindNewDumps(pPath);
-#ifdef HAVE_DBUS
+#ifdef ENABLE_DBUS
     m_pCommLayer = new CCommLayerServerDBus();
-#elif HAVE_SOCKET
+#elif ENABLE_SOCKET
     m_pCommLayer = new CCommLayerServerSocket();
 #endif
-    m_pCommLayer = new CCommLayerServerDBus();
-//    m_pCommLayer = new CCommLayerServerSocket();
+//  m_pCommLayer = new CCommLayerServerDBus();
+//  m_pCommLayer = new CCommLayerServerSocket();
     m_pCommLayer->Attach(this);
 
     if((m_nFd = inotify_init()) == -1)
diff --git a/src/Daemon/CrashWatcher.h b/src/Daemon/CrashWatcher.h
index ec463ee..98ad915 100644
--- a/src/Daemon/CrashWatcher.h
+++ b/src/Daemon/CrashWatcher.h
@@ -30,11 +30,11 @@
 #include "Settings.h"
 
 //FIXME remove when it gets to autoconf
-#include "CommLayerServerDBus.h"
+//#include "CommLayerServerDBus.h"
 //#include "CommLayerServerSocket.h"
-#ifdef HAVE_DBUS
+#ifdef ENABLE_DBUS
     #include "CommLayerServerDBus.h"
-#elif HAVE_SOCKET
+#elif ENABLE_SOCKET
     #include "CommLayerServerSocket.h"
 #endif
 #include "CommLayerInner.h"
diff --git a/src/Daemon/Makefile.am b/src/Daemon/Makefile.am
index b84631e..844abb4 100644
--- a/src/Daemon/Makefile.am
+++ b/src/Daemon/Makefile.am
@@ -6,7 +6,8 @@ abrt_CPPFLAGS = -I$(srcdir)/../../lib/MiddleWare -I$(srcdir)/../../lib/CommLayer
                         -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" $(GLIB_CFLAGS) $(DBUSCPP_CFLAGS) \
                         -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
                         -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
-                        -DCONF_DIR=\"$(CONF_DIR)\"
+                        -DCONF_DIR=\"$(CONF_DIR)\" \
+                        $(ENABLE_SOCKET_OR_DBUS)
 abrt_LDADD = ../../lib/MiddleWare/libABRTMiddleWare.la ../../lib/CommLayer/libABRTCommLayer.la $(DL_LIBS) $(DBUSCPP_LIBS) $(RPM_LIBS)
 dbusabrtconfdir = ${sysconfdir}/dbus-1/system.d/
 dist_dbusabrtconf_DATA = dbus-abrt.conf
-- 
cgit