Merge pull request #582 in SNORT/snort3 from distcheck to master

Squashed commit of the following:

commit c07d6e17554017afad54459cd66ee331da278528
Author: Russ Combs <rucombs@cisco.com>
Date:   Mon Aug 8 14:31:06 2016 -0400

    fix make distcheck

diff --git a/configure.ac b/configure.ac
index 23eea0d6cf7ab6e9a6d1f6d9718ed4cd742b9bea..c2ce18f84805dabed8cdec0def09292519545a89 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1156,7 +1156,6 @@ src/stream/tcp/Makefile \
 src/stream/udp/Makefile \
 src/stream/user/Makefile \
 src/stream/file/Makefile \
-src/stream/tcp/test/Makefile \
 src/network_inspectors/Makefile \
 src/network_inspectors/appid/Makefile \
 src/network_inspectors/arp_spoof/Makefile \

diff --git a/src/log/Makefile.am b/src/log/Makefile.am
index 4b21dea130a0631653a63a9519bed1935cd977c4..326beed586f4898bccfbefc863064af9a1018d6d 100644 (file)
--- a/src/log/Makefile.am
+++ b/src/log/Makefile.am
@@ -17,4 +17,7 @@ messages.cc \
 obfuscator.cc \
 text_log.cc
 
+if ENABLE_UNIT_TESTS
 SUBDIRS = test
+endif
+

diff --git a/src/network_inspectors/appid/Makefile.am b/src/network_inspectors/appid/Makefile.am
index 52c28bdc29a0b5514142219161dd42d4669f4151..fe0c777d70984452aa0421d165e58fb46f80d9df 100644 (file)
--- a/src/network_inspectors/appid/Makefile.am
+++ b/src/network_inspectors/appid/Makefile.am
@@ -191,7 +191,7 @@ $(util_file_list)
 endif
 
 #if BUILD_CPPUTESTS
-#SUBDIRS += test
+#SUBDIRS = test
 #endif