summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-10-15 08:34:08 -0700
committerRainer Gerhards <rgerhards@adiscon.com>2010-10-15 08:34:08 -0700
commit87472f58b4cd47762a7b134f0d8521cabc739cae (patch)
tree2d34c0db0a6ce1b7d3b9e3bcbe8635f4be6b1d3a /Makefile.am
parented9fd3541f07929008a64f5b6ea3bcce70e62c25 (diff)
parentf76b826989cea5fdfbb7b313557775cf082a398e (diff)
downloadrsyslog-87472f58b4cd47762a7b134f0d8521cabc739cae.tar.gz
rsyslog-87472f58b4cd47762a7b134f0d8521cabc739cae.tar.xz
rsyslog-87472f58b4cd47762a7b134f0d8521cabc739cae.zip
Merge branch 'v5-beta' into v5-devel
Conflicts: Makefile.am plugins/imfile/imfile.c runtime/stream.c tests/tcpflood.c
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 54b68153..680a819e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -217,9 +217,9 @@ DISTCHECK_CONFIGURE_FLAGS= --enable-gssapi_krb5 \
--enable-imdiag \
--enable-imptcp \
--enable-omuxsock \
- --enable-shave \
--enable-extended-tests \
--enable-impstats \
+ --enable-imptcp \
--enable-memcheck \
--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
ACLOCAL_AMFLAGS = -I m4