diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-15 08:06:40 -0700 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-15 08:06:40 -0700 |
| commit | 5d8b1846ec376f590b390aef22566b6f87a8c188 (patch) | |
| tree | caac7e1cc47713f6a30b3a8c631fca981080c8f7 /configure.ac | |
| parent | 6714bb931bcbe8d1a4ca60f503598f57e6ebe3b9 (diff) | |
| parent | 3700a64d973f55e1cc8bd478e203f00d529ce27b (diff) | |
| download | rsyslog-5d8b1846ec376f590b390aef22566b6f87a8c188.tar.gz rsyslog-5d8b1846ec376f590b390aef22566b6f87a8c188.tar.xz rsyslog-5d8b1846ec376f590b390aef22566b6f87a8c188.zip | |
Merge branch 'v4-devel' into v5-beta
Conflicts:
Makefile.am
tests/tcpflood.c
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 5dbffed4..9e0aad5c 100644 --- a/configure.ac +++ b/configure.ac @@ -779,6 +779,18 @@ AC_ARG_ENABLE(imsolaris, ) AM_CONDITIONAL(ENABLE_IMSOLARIS, test x$enable_imsolaris = xyes) +# settings for the ptcp input module +AC_ARG_ENABLE(imptcp, + [AS_HELP_STRING([--enable-imptcp],[plain tcp input module enabled @<:@default=no@:>@])], + [case "${enableval}" in + yes) enable_imptcp="yes" ;; + no) enable_imptcp="no" ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-imptcp) ;; + esac], + [enable_imptcp=no] +) +AM_CONDITIONAL(ENABLE_IMPTCP, test x$enable_imptcp = xyes) + # settings for the omprog output module AC_ARG_ENABLE(omprog, @@ -1000,6 +1012,7 @@ AC_CONFIG_FILES([Makefile \ plugins/omuxsock/Makefile \ plugins/imfile/Makefile \ plugins/imsolaris/Makefile \ + plugins/imptcp/Makefile \ plugins/imrelp/Makefile \ plugins/imdiag/Makefile \ plugins/omtesting/Makefile \ @@ -1032,6 +1045,7 @@ echo " Unlimited select() support enabled: $enable_unlimited_select" echo echo "---{ input plugins }---" echo " Klog functionality enabled: $enable_klog ($os_type)" +echo " plain tcp input module enabled: $enable_imptcp" echo " imdiag enabled: $enable_imdiag" echo " file input module enabled: $enable_imfile" echo " Solaris input module enabled: $enable_imsolaris" |