diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-11 11:49:32 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-11 11:49:32 +0200 |
| commit | 32e715929f5d946d7244db3bc0595842dd293dd9 (patch) | |
| tree | 2a154cd6984690e91569feebcd6924efa0eb91b7 /Makefile.am | |
| parent | 89f7dddf36d57c9261464560e3b2c0fb8ea88fd2 (diff) | |
| parent | c664adfa1683763ae503f2da9e8d4d528d6634d1 (diff) | |
| download | rsyslog-32e715929f5d946d7244db3bc0595842dd293dd9.tar.gz rsyslog-32e715929f5d946d7244db3bc0595842dd293dd9.tar.xz rsyslog-32e715929f5d946d7244db3bc0595842dd293dd9.zip | |
Merge branch 'v4-stable-imptcp' into tmp
Conflicts:
Makefile.am
configure.ac
runtime/rsyslog.h
tests/Makefile.am
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 1a090abb..111756f6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -111,6 +111,10 @@ if ENABLE_IMFILE SUBDIRS += plugins/imfile endif +if ENABLE_IMPTCP +SUBDIRS += plugins/imptcp +endif + if ENABLE_IMDIAG SUBDIRS += plugins/imdiag endif @@ -143,5 +147,6 @@ SUBDIRS += tests # in a make distcheck is so that we detect code that accidently was not updated # when some global update happened. DISTCHECK_CONFIGURE_FLAGS=--enable-gssapi_krb5 --enable-imfile --enable-snmp --enable-pgsql --enable-libdbi --enable-mysql --enable-omtemplate --enable-imtemplate --enable-relp --enable-rsyslogd --enable-mail --enable-klog --enable-diagtools --enable-gnutls --enable-omstdout --enable-omprog --enable-imdiag --enable-shave --enable-extended-tests \ - --enable-omuxsock + --enable-omuxsock \ + --enable-imptcp ACLOCAL_AMFLAGS = -I m4 |