diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:32:03 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:32:03 +0200 |
| commit | 8ea796903215ecaba737f9fbe89c0e052825535d (patch) | |
| tree | eed7b742e7d50d7bae6d5f7055342469ec82fdff /configure.ac | |
| parent | 8162ff020d7c37ca1c9ec18e31e09e7f18df1cac (diff) | |
| parent | 68a01594000b788e530ee8f716545dafccf85982 (diff) | |
| download | rsyslog-8ea796903215ecaba737f9fbe89c0e052825535d.tar.gz rsyslog-8ea796903215ecaba737f9fbe89c0e052825535d.tar.xz rsyslog-8ea796903215ecaba737f9fbe89c0e052825535d.zip | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
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 7656d9a7..b1650394 100644 --- a/configure.ac +++ b/configure.ac @@ -774,7 +774,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" ;; |