[packages/syslog-ng] amqp bcond added

jajcus jajcus at pld-linux.org
Fri Mar 30 13:53:27 CEST 2018


commit c612fe0cdf1a826a7439fea1827f09c9825a211f
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date:   Fri Mar 30 13:31:39 2018 +0200

    amqp bcond added

 syslog-ng.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
---
diff --git a/syslog-ng.spec b/syslog-ng.spec
index 9995f17..d4d88ca 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -20,11 +20,16 @@
 %bcond_without	geoip			# support for GeoIP
 %bcond_without	riemann			# support for Riemann monitoring system
 %bcond_without	systemd			# systemd (daemon and journal) support
+%bcond_without	amqp			# AMQP support
 %bcond_with	python			# python module
 %bcond_with	java			# java modules and support
 %bcond_without	system_libivykis	# use system libivykis
 %bcond_without	system_rabbitmq		# use system librabbitmq
 
+%if %{without amqp}
+%undefine with_system_rabbitmq
+%endif
+
 %if "%{pld_release}" == "ac"
 %define		glib2_ver	1:2.16.0
 %else
@@ -360,7 +365,7 @@ done
 	--with-pidfile-dir=/var/run \
 	--with-systemdsystemunitdir=%{systemdunitdir} \
 	--with-timezone-dir=%{_datadir}/zoneinfo \
-	--enable-amqp \
+	%{__enable_disable amqp} \
 	--enable-geoip%{!?with_geoip:=no} \
 	--enable-http%{!?with_http:=no} \
 	--enable-ipv6 \
@@ -501,7 +506,9 @@ exit 0
 %{systemdunitdir}/syslog-ng at .service
 %dir %{moduledir}
 %attr(755,root,root) %{moduledir}/libadd-contextual-data.so
+%if %{with amqp}
 %attr(755,root,root) %{moduledir}/libafamqp.so
+%endif
 %attr(755,root,root) %{moduledir}/libaffile.so
 %attr(755,root,root) %{moduledir}/libafprog.so
 %attr(755,root,root) %{moduledir}/libafsocket.so
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/syslog-ng.git/commitdiff/d66059960026756d2c34d91bf1ccac07971cf4e6



More information about the pld-cvs-commit mailing list