From f67d21702a7f5257b269e2b3b7d41a8d2eefdf0f Mon Sep 17 00:00:00 2001 From: "Russ Combs (rucombs)" Date: Tue, 9 Aug 2016 08:38:09 -0400 Subject: [PATCH] Merge pull request #582 in SNORT/snort3 from distcheck to master Squashed commit of the following: commit c07d6e17554017afad54459cd66ee331da278528 Author: Russ Combs Date: Mon Aug 8 14:31:06 2016 -0400 fix make distcheck --- configure.ac | 1 - src/log/Makefile.am | 3 +++ src/network_inspectors/appid/Makefile.am | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 23eea0d6c..c2ce18f84 100644 --- 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 4b21dea13..326beed58 100644 --- 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 52c28bdc2..fe0c777d7 100644 --- 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 -- 2.47.2