diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-03-13 12:55:13 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-03-13 12:55:13 +0100 |
commit | f664f3b28ef1925e8555cb32cab400c7d5a55723 (patch) | |
tree | 20d4378e452ef329bb7b734d449178e6bfb4f6fc /configure.ac | |
parent | 2bb202f665df594286595e226251b3580b474a4d (diff) | |
parent | 4df8bb4e6b6c8183c504fdb31d667717bf7584e5 (diff) | |
download | rsyslog-f664f3b28ef1925e8555cb32cab400c7d5a55723.tar.gz rsyslog-f664f3b28ef1925e8555cb32cab400c7d5a55723.tar.xz rsyslog-f664f3b28ef1925e8555cb32cab400c7d5a55723.zip |
Merge branch 'master' into rscript-func
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index ff790817..4763fcd5 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([rsyslog],[4.1.4],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[4.1.5],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([ChangeLog]) AC_CONFIG_MACRO_DIR([m4]) @@ -627,8 +627,8 @@ if test "x$enable_rfc3195" = "xyes"; then PKG_CHECK_MODULES(LIBLOGGING, liblogging >= 0.7.1) fi AM_CONDITIONAL(ENABLE_RFC3195, test x$enable_rfc3195 = xyes) -AC_SUBST(RFC3195_CFLAGS) -AC_SUBST(RFC3195_LIBS) +AC_SUBST(LIBLOGGING_CFLAGS) +AC_SUBST(LIBLOGGING_LIBS) # settings for the template input module; copy and modify this code |