diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-20 11:48:17 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-20 11:48:17 +0200 |
| commit | ac32d356b5b776e0ca549d5c689a8932af4c2171 (patch) | |
| tree | d8aa8631ec9b7aae850801be4076d71a652e483e /Makefile.am | |
| parent | fd4a54698cee48da073622f7d6ac49c94ccb1808 (diff) | |
| parent | 1d86889922cb9232819b4451afce091e8a0ad938 (diff) | |
| download | rsyslog-ac32d356b5b776e0ca549d5c689a8932af4c2171.tar.gz rsyslog-ac32d356b5b776e0ca549d5c689a8932af4c2171.tar.xz rsyslog-ac32d356b5b776e0ca549d5c689a8932af4c2171.zip | |
Merge branch 'v5-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
doc/rsyslog_conf_modules.html
plugins/imrelp/imrelp.c
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 8c00e3da..037ad88c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -168,6 +168,10 @@ if ENABLE_OMTEMPLATE SUBDIRS += plugins/omtemplate endif +if ENABLE_MMSNMPTRAPD +SUBDIRS += plugins/mmsnmptrapd +endif + if ENABLE_IMFILE SUBDIRS += plugins/imfile endif @@ -247,5 +251,6 @@ DISTCHECK_CONFIGURE_FLAGS= --enable-gssapi_krb5 \ --enable-pmsnare \ --enable-imtemplate \ --enable-omtemplate \ + --enable-mmsnmptrapd \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) ACLOCAL_AMFLAGS = -I m4 |