diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:46:35 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:46:35 +0200 |
| commit | 76684243dcf8e48db6dda99eff7ea2c3a9f26a91 (patch) | |
| tree | b886dac91e9f70647a882ea3cf8b850ea83fb5e1 /configure.ac | |
| parent | a924cfe6c2da54829f4729d6d56f8a1cc402475e (diff) | |
| parent | 8cd429f7eeee548ff3d5a4d44daa22c2e5a1cf3a (diff) | |
| download | rsyslog-76684243dcf8e48db6dda99eff7ea2c3a9f26a91.tar.gz rsyslog-76684243dcf8e48db6dda99eff7ea2c3a9f26a91.tar.xz rsyslog-76684243dcf8e48db6dda99eff7ea2c3a9f26a91.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index b0e71c20..5cda2f75 100644 --- a/configure.ac +++ b/configure.ac @@ -779,7 +779,7 @@ AM_CONDITIONAL(ENABLE_MAIL, test x$enable_mail = xyes) # would complicate things if we first needed to tell them how to enable imdiag. # rgerhards, 2008-07-25 AC_ARG_ENABLE(imdiag, - [AS_HELP_STRING([--enable-imdiag],[Enable imdiag @<:@default=yes@:>@])], + [AS_HELP_STRING([--enable-imdiag],[Enable imdiag @<:@default=no@:>@])], [case "${enableval}" in yes) enable_imdiag="yes" ;; no) enable_imdiag="no" ;; |