we want to build tests/libntp even if no GTEST

bk: 55643e9f6V7DhM4DgT9VgU3gSVudLA

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5c3d24ea2538cb8331c9752ce4b39c2bf87b4f13..790326ca2809275368dc0060536d89f8213caebb 100644 (file)
--- 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 d5712de757d1a817dd5a12ef07315da38b5b8a00..2c9bd6fe9abe747c63bcc9080abbbedf3e2dc70f 100644 (file)
--- 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 \