Signed-off-by: Nikola Pajkovsky <npajkovs(a)redhat.com>
---
configure.ac | 15 ++++++++++-----
src/lib/Makefile.am | 8 ++++++--
src/plugins/Makefile.am | 23 +++++++++++++++++------
3 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/configure.ac b/configure.ac
index d6c877a..27d9680 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,10 +43,6 @@ AC_ARG_ENABLE(debug,
[Enable debug information])],
[CFLAGS="$CFLAGS -DDEBUG -ggdb -g -O0"])
-AC_ARG_ENABLE([bodhi],
- AC_HELP_STRING([--disable-bodhi], [do not use bodhi plugin]))
-
-
dnl ****** INTERNATIONALIZATION **********************
GETTEXT_PACKAGE=libreport
AC_SUBST(GETTEXT_PACKAGE)
@@ -132,13 +128,22 @@ PKG_CHECK_MODULES([DBUS], [dbus-1])
PKG_CHECK_MODULES([LIBXML], [libxml-2.0])
PKG_CHECK_MODULES([NSS], [nss])
PKG_CHECK_MODULES([CURL], [libcurl])
-PKG_CHECK_MODULES([JSON_C], [json])
PKG_CHECK_MODULES([BTPARSER], [btparser])
PKG_CHECK_MODULES([NEWT], [libnewt])
PKG_CHECK_MODULES([PROXY], [libproxy-1.0], [
AC_DEFINE([HAVE_PROXY], [1], [Use libproxy])
], [:])
+AC_ARG_WITH(ureport,
+AS_HELP_STRING([--with-ureport],[use uReport plugin (default is YES)]),
+LIBREPORT_PARSE_WITH([ureport]))
+if test -z "$NO_UREPORT"; then
+AM_CONDITIONAL(BUILD_UREPORT, true)
+PKG_CHECK_MODULES([JSON_C], [json])
+else
+AM_CONDITIONAL(BUILD_UREPORT, false)
+fi dnl end NO_UREPORT
+
PKG_PROG_PKG_CONFIG
AC_CHECK_HEADER([libtar.h], [],
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 50ff9ae..5345950 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -93,10 +93,14 @@ if BUILD_BUGZILLA
libreport_web_o += abrt_xmlrpc.h abrt_xmlrpc.c
endif
+if BUILD_UREPORT
+libreport_web_o += ureport.h json.c
+endif
+
libreport_web_la_SOURCES = $(libreport_web_o) \
curl.c \
- proxies.h proxies.c \
- ureport.h json.c
+ proxies.h proxies.c
+
libreport_web_la_CPPFLAGS = \
-I$(srcdir)/../include \
-DLOCALSTATEDIR='"$(localstatedir)"' \
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index edd4f1a..0d8a978 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -5,14 +5,17 @@ if BUILD_BUGZILLA
reporters_bin += reporter-bugzilla
endif
+if BUILD_UREPORT
+reporters_bin += reporter-ureport
+endif
+
bin_PROGRAMS = $(reporters_bin) \
reporter-rhtsupport \
reporter-kerneloops \
reporter-upload \
reporter-mailx \
reporter-print \
- report \
- reporter-ureport
+ report
pluginsconfdir = $(PLUGINS_CONF_DIR)
@@ -34,14 +37,17 @@ if BUILD_BUGZILLA
reporters_events += report_Bugzilla.xml report_Bugzilla.conf
endif
+if BUILD_UREPORT
+reporters_events += report_uReport.xml
+endif
+
dist_events_DATA = $(reporters_events) \
report_Logger.conf \
report_Logger.xml \
report_Mailx.xml \
report_RHTSupport.xml \
report_Kerneloops.xml \
- report_Uploader.xml \
- report_uReport.xml
+ report_Uploader.xml
@INTLTOOL_XML_RULE@
@@ -59,14 +65,17 @@ if BUILD_BUGZILLA
reporters_extra_dist += report_Bugzilla.xml.in report_Bugzilla.conf
endif
+if BUILD_UREPORT
+reporters_extra_dist += report_uReport.xml.in
+endif
+
EXTRA_DIST = $(reporters_extra_dist) \
report_Logger.conf \
report_Logger.xml.in \
report_Mailx.xml.in \
report_RHTSupport.xml.in \
report_Kerneloops.xml.in \
- report_Uploader.xml.in \
- report_uReport.xml.in
+ report_Uploader.xml.in
$(DESTDIR)/$(DEBUG_INFO_DIR):
$(mkdir_p) '$@'
@@ -214,6 +223,7 @@ report_CPPFLAGS = \
report_LDADD = \
../lib/libreport.la
+if BUILD_UREPORT
reporter_ureport_SOURCES = \
ureport.c
reporter_ureport_CPPFLAGS = \
@@ -225,5 +235,6 @@ reporter_ureport_CPPFLAGS = \
reporter_ureport_LDADD = \
../lib/libreport.la \
../lib/libreport-web.la
+endif
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
--
1.7.12
Show replies by date