summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-07-06 08:36:58 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-07-06 08:36:58 +0200
commit8fbefa688fc18dd1936158318ec92a108303d2e8 (patch)
tree5090afbc864526b9d381b365dfc6365c0ffe408d /configure.ac
parent44609ec259fdd321520111049ace194a0941a157 (diff)
parent68a01594000b788e530ee8f716545dafccf85982 (diff)
downloadrsyslog-8fbefa688fc18dd1936158318ec92a108303d2e8.tar.gz
rsyslog-8fbefa688fc18dd1936158318ec92a108303d2e8.tar.xz
rsyslog-8fbefa688fc18dd1936158318ec92a108303d2e8.zip
Merge branch 'v5-stable' into beta
Conflicts: ChangeLog doc/manual.html
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 4cf83c38..8eb280dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -777,7 +777,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" ;;