diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-03-11 15:15:34 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-03-11 15:15:34 +0100 |
| commit | ae7a01e137f14055f9472408d0cf3ebf9893afba (patch) | |
| tree | 37af475499d6dd82b986f34c4a53db2ecbd071bd /configure.ac | |
| parent | 24a36fd14226ccf5f139c07252f05f3db124604e (diff) | |
| parent | 7f43af08fec0824c30c5bb1ddb9b96427828c987 (diff) | |
| download | rsyslog-ae7a01e137f14055f9472408d0cf3ebf9893afba.tar.gz rsyslog-ae7a01e137f14055f9472408d0cf3ebf9893afba.tar.xz rsyslog-ae7a01e137f14055f9472408d0cf3ebf9893afba.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.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 5e523083..8538a8f9 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 |