summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-05-10 09:08:46 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-05-10 09:08:46 +0200
commit3c740a9c52bf28cde062bc4b11c3e2f397f23650 (patch)
tree388fa191c1b0bdc905badecae61d39d4c3079502 /Makefile.am
parent87a01476e2a63ab7b6740b6b4182281d271ef382 (diff)
parente8a71cd0d6ea72cb6495305286cb778b9d951e0c (diff)
downloadrsyslog-3c740a9c52bf28cde062bc4b11c3e2f397f23650.tar.gz
rsyslog-3c740a9c52bf28cde062bc4b11c3e2f397f23650.tar.xz
rsyslog-3c740a9c52bf28cde062bc4b11c3e2f397f23650.zip
Merge branch 'v5-stable-snmptrapd' into v5-stable
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 2d73013b..de4777b2 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
@@ -239,5 +243,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