From: Damir Tomic <viperus@ntp.org>
Date: Tue, 26 May 2015 09:36:31 +0000 (+0000)
Subject: we want to build tests/libntp even if no GTEST
X-Git-Tag: NTP_4_3_40~6^2~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe3179af22e88b0b50a54cbc1336314c56b88c78;p=thirdparty%2Fntp.git

we want to build tests/libntp even if no GTEST

bk: 55643e9f6V7DhM4DgT9VgU3gSVudLA
---

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5c3d24ea2..790326ca2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,12 +2,14 @@ NULL =
 SUBDIRS = 
 
 if GTEST_AVAILABLE
-SUBDIRS +=	libntp	\
-		ntpd	\
-		$(NULL)
+SUBDIRS +=	\
+	ntpd	\
+	$(NULL)
 endif
 
-SUBDIRS +=	bug-2803	\
-		sandbox		\
-		$(NULL)
+SUBDIRS +=		\
+	bug-2803	\
+	libntp		\
+	sandbox		\
+	$(NULL)
 
diff --git a/tests/libntp/Makefile.am b/tests/libntp/Makefile.am
index d5712de75..2c9bd6fe9 100644
--- a/tests/libntp/Makefile.am
+++ b/tests/libntp/Makefile.am
@@ -4,7 +4,12 @@ CLEANFILES =
 
 run_unity =	cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb
 
-check_PROGRAMS = test-libntp tests
+check_PROGRAMS = test-libntp
+if GTEST_AVAILABLE
+check_PROGRAMS += tests
+else
+EXTRA_PROGRAMS = tests
+endif
 
 LDADD =					\
 	$(top_builddir)/libntp/libntp.a	\