diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/daemon/Daemon.cpp | 11 | ||||
| -rw-r--r-- | src/daemon/Makefile.am | 16 |
2 files changed, 10 insertions, 17 deletions
diff --git a/src/daemon/Daemon.cpp b/src/daemon/Daemon.cpp index d7ff5781..9e6965fb 100644 --- a/src/daemon/Daemon.cpp +++ b/src/daemon/Daemon.cpp @@ -26,8 +26,6 @@ #include <string> #include <sys/inotify.h> #include <sys/ioctl.h> /* ioctl(FIONREAD) */ -#include <xmlrpc-c/base.h> -#include <xmlrpc-c/client.h> #include <glib.h> #include "abrtlib.h" #include "abrt_exception.h" @@ -970,14 +968,6 @@ int main(int argc, char** argv) if (LoadSettings() != 0) throw 1; - VERB1 log("Initializing XML-RPC library"); - xmlrpc_env env; - xmlrpc_env_init(&env); - xmlrpc_client_setup_global_const(&env); - if (env.fault_occurred) - error_msg_and_die("XML-RPC Fault: %s(%d)", env.fault_string, env.fault_code); - xmlrpc_env_clean(&env); - VERB1 log("Creating glib main loop"); pMainloop = g_main_loop_new(NULL, FALSE); @@ -1085,7 +1075,6 @@ int main(int argc, char** argv) /* Error or INT/TERM. Clean up, in reverse order. * Take care to not undo things we did not do. */ - xmlrpc_client_teardown_global_const(); dumpsocket_shutdown(); if (pidfile_created) unlink(VAR_RUN_PIDFILE); diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index 0129ffc6..daac8462 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -36,16 +36,14 @@ abrtd_CPPFLAGS = \ -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ - $(XMLRPC_CFLAGS) $(XMLRPC_CLIENT_CFLAGS) \ $(ENABLE_SOCKET_OR_DBUS) \ -D_GNU_SOURCE \ -Wall abrtd_LDADD = \ - ../../lib/utils/libABRTUtils.la \ - ../../lib/utils/libABRTdUtils.la \ $(DL_LIBS) \ $(DBUS_LIBS) \ - $(XMLRPC_LIBS) $(XMLRPC_CLIENT_LIBS) + ../../lib/utils/libABRTUtils.la \ + ../../lib/utils/libABRTdUtils.la abrt_server_SOURCES = \ abrt-server.c @@ -178,10 +176,13 @@ abrt_action_bugzilla_CPPFLAGS = \ -D_GNU_SOURCE \ -Wall -Werror abrt_action_bugzilla_LDADD = \ + $(GLIB_LIBS) \ + ../../lib/utils/libABRT_web_utils.la \ ../../lib/utils/libABRTdUtils.la \ ../../lib/utils/libABRTUtils.la abrt_action_rhtsupport_SOURCES = \ + abrt_rh_support.h abrt_rh_support.c \ abrt-action-rhtsupport.cpp abrt_action_rhtsupport_CPPFLAGS = \ -I$(srcdir)/../../inc \ @@ -195,10 +196,14 @@ abrt_action_rhtsupport_CPPFLAGS = \ -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \ -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \ $(GLIB_CFLAGS) \ + $(XMLRPC_CFLAGS) $(XMLRPC_CLIENT_CFLAGS) \ -D_GNU_SOURCE \ -Wall -Werror abrt_action_rhtsupport_LDFLAGS = -ltar abrt_action_rhtsupport_LDADD = \ + $(GLIB_LIBS) \ + $(XMLRPC_LIBS) $(XMLRPC_CLIENT_LIBS) \ + ../../lib/utils/libABRT_web_utils.la \ ../../lib/utils/libABRTdUtils.la \ ../../lib/utils/libABRTUtils.la @@ -216,11 +221,10 @@ abrt_action_kerneloops_CPPFLAGS = \ -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \ -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \ $(GLIB_CFLAGS) \ - $(CURL_CFLAGS) \ -D_GNU_SOURCE \ -Wall -Werror abrt_action_kerneloops_LDADD = \ - $(CURL_LIBS) \ + ../../lib/utils/libABRT_web_utils.la \ ../../lib/utils/libABRTdUtils.la \ ../../lib/utils/libABRTUtils.la |