diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-11 10:24:58 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-11 10:24:58 +0100 |
commit | 6c3ef4dacfa0a0fb0099299e30335c788704fe2a (patch) | |
tree | cb43da8a6fd9508f872059d6dada70ed02348b10 /Makefile.am | |
parent | cd61ecd459d7ba915ac5b31743e7ded8db62e30e (diff) | |
parent | fd26a42bdc04eaf497cafd9ef806a54f3de1a7e9 (diff) | |
download | rsyslog-6c3ef4dacfa0a0fb0099299e30335c788704fe2a.tar.gz rsyslog-6c3ef4dacfa0a0fb0099299e30335c788704fe2a.tar.xz rsyslog-6c3ef4dacfa0a0fb0099299e30335c788704fe2a.zip |
Merge branch 'v5-beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/omlibdbi/omlibdbi.c
tests/Makefile.am
tests/diag.sh
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index b63e9ecc..9809364b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,9 +44,6 @@ endif # if HAVE_SYSTEMD -dist_systemdsystemunit_DATA = \ - rsyslog.socket - nodist_systemdsystemunit_DATA = \ rsyslog.service @@ -241,5 +238,8 @@ DISTCHECK_CONFIGURE_FLAGS= --enable-gssapi_krb5 \ --enable-extended-tests \ --enable-impstats \ --enable-memcheck \ + --enable-pmaixforwardedfrom \ + --enable-pmcisconames \ + --enable-pmsnare \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) ACLOCAL_AMFLAGS = -I m4 |