[#3032] disabled compilation of test libs when --with-gtest is not used

diff --git a/src/bin/dhcp4/tests/Makefile.am b/src/bin/dhcp4/tests/Makefile.am
index 7394350406ad0af29e1d2f5c0babcec306c3fd85..8a2c084089679c0c8f0395f73e0d30810413f695 100644 (file)
--- a/src/bin/dhcp4/tests/Makefile.am
+++ b/src/bin/dhcp4/tests/Makefile.am
@@ -47,6 +47,8 @@ endif
 # -rpath /nowhere is a hack to trigger libtool to not create a
 # convenience archive, resulting in shared modules
 
+if HAVE_GTEST
+
 libco1_la_SOURCES  = callout_library_1.cc callout_library_common.h
 libco1_la_CXXFLAGS = $(AM_CXXFLAGS)
 libco1_la_CPPFLAGS = $(AM_CPPFLAGS)
@@ -65,8 +67,6 @@ libco3_la_LDFLAGS = -avoid-version -export-dynamic -module -rpath /nowhere
 # Don't install test libraries.
 noinst_LTLIBRARIES = libco1.la libco2.la libco3.la
 
-if HAVE_GTEST
-
 # C++ tests
 PROGRAM_TESTS = dhcp4_unittests
 

diff --git a/src/bin/dhcp6/tests/Makefile.am b/src/bin/dhcp6/tests/Makefile.am
index 7955bb69dafc3bede7f25413942c9addb7377dc3..35e16918e4f30c3fdafa5c19354da9fe939cc44c 100644 (file)
--- a/src/bin/dhcp6/tests/Makefile.am
+++ b/src/bin/dhcp6/tests/Makefile.am
@@ -48,6 +48,8 @@ endif
 # -rpath /nowhere is a hack to trigger libtool to not create a
 # convenience archive, resulting in shared modules
 
+if HAVE_GTEST
+
 libco1_la_SOURCES  = callout_library_1.cc callout_library_common.h
 libco1_la_CXXFLAGS = $(AM_CXXFLAGS)
 libco1_la_CPPFLAGS = $(AM_CPPFLAGS)
@@ -66,8 +68,6 @@ libco3_la_LDFLAGS = -avoid-version -export-dynamic -module -rpath /nowhere
 # Don't install test libraries.
 noinst_LTLIBRARIES = libco1.la libco2.la libco3.la
 
-if HAVE_GTEST
-
 # C++ tests
 PROGRAM_TESTS = dhcp6_unittests
 

diff --git a/src/lib/log/tests/Makefile.am b/src/lib/log/tests/Makefile.am
index 55240aa699746b37b20aadd3f346040ab515c831..b4adf7e55180a6cc0daeaaf5f433858c1cad9590 100644 (file)
--- a/src/lib/log/tests/Makefile.am
+++ b/src/lib/log/tests/Makefile.am
@@ -6,8 +6,7 @@ AM_CPPFLAGS += $(BOOST_INCLUDES) $(GTEST_INCLUDES) $(LOG4CPLUS_INCLUDES)
 
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
 
-AM_LDADD  =
-AM_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
+AM_LDADD = $(top_builddir)/src/lib/log/libkea-log.la
 AM_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
 AM_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 AM_LDADD += $(LOG4CPLUS_LIBS) $(GTEST_LDADD)
@@ -17,6 +16,8 @@ if USE_STATIC_LINK
 AM_LDFLAGS += -static
 endif
 
+if HAVE_GTEST
+
 CLEANFILES = *.gcno *.gcda *.lock
 
 EXTRA_DIST = log_test_messages.mes
@@ -71,8 +72,6 @@ SHTESTS += severity_test.sh
 DISTCLEANFILES = tempdir.h
 DISTCLEANFILES += $(SHTESTS)
 
-if HAVE_GTEST
-
 TESTS_ENVIRONMENT = $(LIBTOOL) --mode=execute $(VALGRIND_COMMAND)
 
 # Set of unit tests for the general logging classes

diff --git a/src/lib/util/unittests/Makefile.am b/src/lib/util/unittests/Makefile.am
index 2d6523cb7755dd46e442e39e54c35f666fec2d39..26aa4c0ca853ea9c798487cd570721adb66bf473 100644 (file)
--- a/src/lib/util/unittests/Makefile.am
+++ b/src/lib/util/unittests/Makefile.am
@@ -1,31 +1,27 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
 
+if HAVE_GTEST
 noinst_LTLIBRARIES = libutil_unittests.la
 libutil_unittests_la_SOURCES = fork.h fork.cc
 libutil_unittests_la_SOURCES += newhook.h newhook.cc
 libutil_unittests_la_SOURCES += testdata.h testdata.cc
-if HAVE_GTEST
 libutil_unittests_la_SOURCES += resource.h resource.cc
 libutil_unittests_la_SOURCES += check_valgrind.h check_valgrind.cc
 libutil_unittests_la_SOURCES += run_all.h run_all.cc
 libutil_unittests_la_SOURCES += textdata.h
 libutil_unittests_la_SOURCES += wiredata.h wiredata.cc
 libutil_unittests_la_SOURCES += interprocess_util.h interprocess_util.cc
-endif
 
 # For now, this isn't needed for libutil_unittests
 EXTRA_DIST = mock_socketsession.h
 
 libutil_unittests_la_CPPFLAGS = $(AM_CPPFLAGS)
-if HAVE_GTEST
 libutil_unittests_la_CPPFLAGS += $(GTEST_INCLUDES)
-endif
 
 libutil_unittests_la_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 libutil_unittests_la_LIBADD  = $(top_builddir)/src/lib/util/libkea-util.la
 libutil_unittests_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-if HAVE_GTEST
 libutil_unittests_la_LIBADD += $(GTEST_LDADD)
 endif