diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-06 17:32:29 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-06 17:32:29 +0200 |
| commit | 40e70777ea9e9d72b87a387ca3fe67ce45c3e00f (patch) | |
| tree | 88687f796b0efd4c2c61aaca4feb5977933f9f14 /Makefile.am | |
| parent | e4c926bfbca3aab3fe34fc9cfedb7343423de016 (diff) | |
| parent | 80ff634c841d692c1d9f335b88e225d6ce7317f7 (diff) | |
| download | rsyslog-40e70777ea9e9d72b87a387ca3fe67ce45c3e00f.tar.gz rsyslog-40e70777ea9e9d72b87a387ca3fe67ce45c3e00f.tar.xz rsyslog-40e70777ea9e9d72b87a387ca3fe67ce45c3e00f.zip | |
Merge branch 'v4-devel'
Conflicts:
ChangeLog
Makefile.am
configure.ac
doc/rsyslog_conf_modules.html
runtime/rsyslog.h
tests/Makefile.am
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index f4cd98f4..67ae66bc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -117,6 +117,9 @@ endif if ENABLE_OMUDPSPOOF SUBDIRS += plugins/omudpspoof + +if ENABLE_OMUXSOCK +SUBDIRS += plugins/omuxsock endif if ENABLE_OMTEMPLATE @@ -179,6 +182,7 @@ DISTCHECK_CONFIGURE_FLAGS= --enable-gssapi_krb5 \ --enable-omruleset \ --enable-omprog \ --enable-imdiag \ + --enable-omuxsock \ --enable-shave \ --enable-extended-tests \ --enable-memcheck |