diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 17 | ||||
| -rw-r--r-- | plugins/cust1/Makefile.am | 6 |
4 files changed, 1 insertions, 27 deletions
@@ -585,6 +585,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 03a78cce..9edc1bcb 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 b57aabf0..588698a4 100644 --- a/configure.ac +++ b/configure.ac @@ -1175,21 +1175,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(sm_cust_bindcdr, @@ -1325,7 +1310,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 @@ -1340,7 +1324,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 = |