diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-03-11 15:16:57 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-03-11 15:16:57 +0100 |
commit | 4df8bb4e6b6c8183c504fdb31d667717bf7584e5 (patch) | |
tree | a707a3ea82a3bdefd91ecea44ed7e119b43d496f /configure.ac | |
parent | dd19c937c1bfbe16063c9d633a79810944ac7eba (diff) | |
parent | ae7a01e137f14055f9472408d0cf3ebf9893afba (diff) | |
download | rsyslog-4df8bb4e6b6c8183c504fdb31d667717bf7584e5.tar.gz rsyslog-4df8bb4e6b6c8183c504fdb31d667717bf7584e5.tar.xz rsyslog-4df8bb4e6b6c8183c504fdb31d667717bf7584e5.zip |
Merge branch 'beta'
Conflicts:
doc/omrelp.html
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 9ba24085..00b65410 100644 --- a/configure.ac +++ b/configure.ac @@ -617,8 +617,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 |