summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am6
-rw-r--r--tests/Makefile.am6
2 files changed, 9 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 6eb7b5b8..4b04dd9b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -284,8 +284,7 @@ SUBDIRS += tests
# temporarily be removed below. The intent behind forcing everthing to compile
# in a make distcheck is so that we detect code that accidently was not updated
# when some global update happened.
-DISTCHECK_CONFIGURE_FLAGS= --enable-gssapi_krb5 \
- --enable-imfile \
+DISTCHECK_CONFIGURE_FLAGS= --enable-imfile \
--enable-snmp \
--enable-libdbi \
--enable-mysql \
@@ -308,11 +307,12 @@ DISTCHECK_CONFIGURE_FLAGS= --enable-gssapi_krb5 \
--enable-pmaixforwardedfrom \
--enable-pmcisconames \
--enable-pmsnare \
- --enable-mmsnmptrapd \
--enable-elasticsearch \
--enable-valgrind \
--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
# temporarily disable these checks for make distcheck 2012-09-06 rgerhards
+# --enable-mmsnmptrapd \
+# --enable-gssapi_krb5 \
# --enable-extended-tests \
# --enable-pgsql
ACLOCAL_AMFLAGS = -I m4
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c4084a4b..070b2350 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -293,8 +293,12 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
testsuites/rscript_stop.conf \
rscript_stop2.sh \
testsuites/rscript_stop2.conf \
+ stop.sh \
+ testsuites/stop.conf \
stop-localvar.sh \
testsuites/stop-localvar.conf \
+ global_vars.sh \
+ testsuites/global_vars.conf \
rscript_prifilt.sh \
testsuites/rscript_prifilt.conf \
rscript_optimizer1.sh \
@@ -466,6 +470,8 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
testsuites/master.nolimittag \
rulesetmultiqueue.sh \
testsuites/rulesetmultiqueue.conf \
+ rulesetmultiqueue-v6.sh \
+ testsuites/rulesetmultiqueue-v6.conf \
omruleset.sh \
testsuites/omruleset.conf \
omruleset-queue.sh \