diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-04 18:45:11 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-04 18:45:11 +0200 |
| commit | 74efc3956408e7a56e354642d64c20c956220143 (patch) | |
| tree | 891cf1baf617a5da0276961402c21a93b2679abe | |
| parent | 1b6ba3cfcb3d066b489de82a140722a158ddf2dd (diff) | |
| parent | 76c80165e969a37c0fc176661879661c20e9a198 (diff) | |
| download | rsyslog-74efc3956408e7a56e354642d64c20c956220143.tar.gz rsyslog-74efc3956408e7a56e354642d64c20c956220143.tar.xz rsyslog-74efc3956408e7a56e354642d64c20c956220143.zip | |
Merge branch 'v6-stable' into beta
Conflicts:
plugins/cust1/Makefile.am
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | plugins/cust1/Makefile.am | 6 | ||||
| -rw-r--r-- | tools/Makefile.am | 3 |
5 files changed, 2 insertions, 28 deletions
@@ -727,6 +727,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 e7aaca55..cd1d22b4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -116,10 +116,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 0aa51da0..f7d2bdd4 100644 --- a/configure.ac +++ b/configure.ac @@ -1233,21 +1233,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, @@ -1435,7 +1420,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 9963d0d6..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 = diff --git a/tools/Makefile.am b/tools/Makefile.am index 68e5769b..25761708 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -35,8 +35,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 |