diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-26 16:02:58 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-26 16:02:58 +0200 |
commit | bb2ed66c8903504ec225bd36bd6135871b70adc5 (patch) | |
tree | 686549eef75239575484111b44db996e7012a4c3 | |
parent | 4acf8e361aa68b3e753611c7c7e607c04dfd8d1a (diff) | |
parent | 6106c05fcfbb8fe744108e4c3a66948b66f560f8 (diff) | |
download | rsyslog-bb2ed66c8903504ec225bd36bd6135871b70adc5.tar.gz rsyslog-bb2ed66c8903504ec225bd36bd6135871b70adc5.tar.bz2 rsyslog-bb2ed66c8903504ec225bd36bd6135871b70adc5.zip |
Merge branch 'v7-stable'
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | configure.ac | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -185,6 +185,8 @@ Version 7.5.0 [devel] 2013-06-11 Thanks to Axel Rau for the patch. --------------------------------------------------------------------------- Version 7.4.6 [v7.4-stable] 2013-11-?? +- now requires libestr 0.1.9 as earlier versions lead to problems with + number handling in RainerScript - bugfix: memory leak in strlen() RainerScript function Thanks to Gregoire Seux for reportig this bug. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=486 diff --git a/configure.ac b/configure.ac index 30c4559b..dfe12dac 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,7 @@ AC_CANONICAL_HOST PKG_PROG_PKG_CONFIG # modules we require -PKG_CHECK_MODULES(LIBESTR, libestr >= 0.1.8) +PKG_CHECK_MODULES(LIBESTR, libestr >= 0.1.9) PKG_CHECK_MODULES([JSON_C], [json],, [ PKG_CHECK_MODULES([JSON_C], [json-c]) ]) |