diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:07:04 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:07:04 +0200 |
commit | 68a01594000b788e530ee8f716545dafccf85982 (patch) | |
tree | c5b54c9add730528f99c816db4faa55dfcfdbd1a /configure.ac | |
parent | e8e881e9795e5dc9fc14fd7f34523bcd6ae13106 (diff) | |
parent | f09ee69ee1b7f8c098d0720c8e85a6753cc7d342 (diff) | |
download | rsyslog-68a01594000b788e530ee8f716545dafccf85982.tar.gz rsyslog-68a01594000b788e530ee8f716545dafccf85982.tar.xz rsyslog-68a01594000b788e530ee8f716545dafccf85982.zip |
Merge branch 'v4-stable' into v5-stable
Conflicts:
ChangeLog
configure.ac
doc/manual.html
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 5873c661..43382c9f 100644 --- a/configure.ac +++ b/configure.ac @@ -772,7 +772,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" ;; |