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 /Makefile.am | |
| 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 'Makefile.am')
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index e7c42eb8..d9ee1cb8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -131,6 +131,10 @@ if ENABLE_IMFILE SUBDIRS += plugins/imfile endif +if ENABLE_IMPTCP +SUBDIRS += plugins/imptcp +endif + if ENABLE_IMDIAG SUBDIRS += plugins/imdiag endif @@ -184,7 +188,7 @@ DISTCHECK_CONFIGURE_FLAGS= --enable-gssapi_krb5 \ --enable-omprog \ --enable-imdiag \ --enable-omuxsock \ - --enable-shave \ --enable-extended-tests \ + --enable-imptcp \ --enable-memcheck ACLOCAL_AMFLAGS = -I m4 |