From 1d41ac2b7b7dccd307856b173a3bf358ce51929e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 4 Oct 2012 15:48:03 +0200 Subject: build: don't include librsyslog.la in the dist tarball libtool archives are not meant to be shipped in the source tarball. --- tools/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 4e457426..e8da168d 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -34,8 +34,7 @@ rsyslogd_SOURCES = \ pidfile.c \ pidfile.h \ \ - ../dirty.h \ - ../runtime/librsyslog.la + ../dirty.h rsyslogd_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(CNF_LIBS) # note: it looks like librsyslog.la must be explicitely given on LDDADD, # otherwise dependencies are not properly calculated (resulting in a -- cgit v1.2.3 From 80466e20d19a5fcf7b9d8798b3d7afb42f7e98d7 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 4 Oct 2012 18:42:52 +0200 Subject: remove cust1 dummy plugin from build system Thanks to Michael Biebl for identifying this as the culprit for several build-related issues. The plugin is a placeholder, and was not used for quite some while. It is definitely not worth the effort to keep it along. If needed, can be quickly created. --- ChangeLog | 1 + Makefile.am | 4 ---- configure.ac | 17 ----------------- plugins/cust1/Makefile.am | 6 ------ 4 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 plugins/cust1/Makefile.am diff --git a/ChangeLog b/ChangeLog index 34472ab8..9574a84f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ Version 5.10.1 [V5-STABLE], 2012-0?-?? Thanks to Cristian Ionescu-Idbohrn and Jonny Törnbom - bugfix: fixed wrong bufferlength for snprintf in tcpflood.c when using the -f (dynafiles) option. +- fixed issues in build system (namely related to cust1 dummy plugin) --------------------------------------------------------------------------- Version 5.10.0 [V5-STABLE], 2012-08-23 diff --git a/Makefile.am b/Makefile.am index f502dafa..0d481243 100644 --- a/Makefile.am +++ b/Makefile.am @@ -112,10 +112,6 @@ if ENABLE_SNMP SUBDIRS += plugins/omsnmp endif -if ENABLE_CUST1 -SUBDIRS += plugins/cust1 -endif - if ENABLE_SMCUSTBINDCDR SUBDIRS += plugins/sm_cust_bindcdr endif diff --git a/configure.ac b/configure.ac index cf8a205e..1069db7c 100644 --- a/configure.ac +++ b/configure.ac @@ -1119,21 +1119,6 @@ AC_ARG_ENABLE(omuxsock, AM_CONDITIONAL(ENABLE_OMUXSOCK, test x$enable_omuxsock = xyes) -# This provides a vehicle to integrate custom modules, that are not -# part of rsyslog, into the build process. It is named cust1, so that -# additional such modules can easily be added. -AC_ARG_ENABLE(cust1, - [AS_HELP_STRING([--enable-cust1],[Compiles cust1 module @<:@default=no@:>@])], - [case "${enableval}" in - yes) enable_cust1="yes" ;; - no) enable_cust1="no" ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-cust1) ;; - esac], - [enable_cust1=no] -) -AM_CONDITIONAL(ENABLE_CUST1, test x$enable_cust1 = xyes) - - # A custom strgen that also serves as a sample of how to do # SQL-generating strgen's AC_ARG_ENABLE(smcustbindcdr, @@ -1261,7 +1246,6 @@ AC_CONFIG_FILES([Makefile \ plugins/omelasticsearch/Makefile \ plugins/sm_cust_bindcdr/Makefile \ plugins/mmsnmptrapd/Makefile \ - plugins/cust1/Makefile \ java/Makefile \ tests/Makefile]) AC_OUTPUT @@ -1276,7 +1260,6 @@ echo " Zlib compression support enabled: $enable_zlib" echo " rsyslog runtime will be built: $enable_rsyslogrt" echo " rsyslogd will be built: $enable_rsyslogd" echo " GUI components will be built: $enable_gui" -echo " custom module 1 will be built: $enable_cust1" echo " Unlimited select() support enabled: $enable_unlimited_select" echo echo "---{ input plugins }---" diff --git a/plugins/cust1/Makefile.am b/plugins/cust1/Makefile.am deleted file mode 100644 index d2e075f9..00000000 --- a/plugins/cust1/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -pkglib_LTLIBRARIES = cust1.la - -cust1_la_SOURCES = cust1.c -cust1_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) -cust1_la_LDFLAGS = -module -avoid-version -cust1_la_LIBADD = -- cgit v1.2.3