diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-04 11:15:41 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-04 11:15:41 +0200 |
| commit | 27f1f720fadade9f3ba3211647579e70a7a835e4 (patch) | |
| tree | 6b2a769fda7c94153d00dd33dd7a06352a33ed98 | |
| parent | 288a6e4bc8705d65ac692434dd91a1747bdc015b (diff) | |
| parent | 050db3854d664b47b8b27d7877984500c8ba9568 (diff) | |
| download | rsyslog-27f1f720fadade9f3ba3211647579e70a7a835e4.tar.gz rsyslog-27f1f720fadade9f3ba3211647579e70a7a835e4.tar.xz rsyslog-27f1f720fadade9f3ba3211647579e70a7a835e4.zip | |
Merge branch 'v6-stable' into beta
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | configure.ac | 14 |
2 files changed, 10 insertions, 7 deletions
@@ -182,6 +182,9 @@ Version 6.2.2 [v6-stable], 2012-05-?? full delayable sources somewhat smarter and permits, assuming sufficient timouts, to persist message up to the max queue capacity. Also some nits in debug instrumentation have been fixed. +- bugfix: --enable-smcustbindcdr configure directive did not work + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=330 + Thanks to Ultrabug for the patch. --------------------------------------------------------------------------- Version 6.2.1 [v6-stable], 2012-05-10 - change plugin config interface to be compatible with pre-v6.2 system diff --git a/configure.ac b/configure.ac index 0c6fe35c..4109b9a8 100644 --- a/configure.ac +++ b/configure.ac @@ -1188,16 +1188,16 @@ 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, - [AS_HELP_STRING([--enable-smcustbindcdr],[Compiles smcustbindcdr module @<:@default=no@:>@])], +AC_ARG_ENABLE(sm_cust_bindcdr, + [AS_HELP_STRING([--enable-sm_cust_bindcdr],[Compiles sm_cust_bindcdr module @<:@default=no@:>@])], [case "${enableval}" in - yes) enable_smcustbindcdr="yes" ;; - no) enable_smcustbindcdr="no" ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-smcustbindcdr) ;; + yes) enable_sm_cust_bindcdr="yes" ;; + no) enable_sm_cust_bindcdr="no" ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-sm_cust_bindcdr) ;; esac], - [enable_smcustbindcdr=no] + [enable_sm_cust_bindcdr=no] ) -AM_CONDITIONAL(ENABLE_SMCUSTBINDCDR, test x$enable_smcustbindcdr = xyes) +AM_CONDITIONAL(ENABLE_SMCUSTBINDCDR, test x$enable_sm_cust_bindcdr = xyes) # settings for mmsnmptrapd message modification module |