From: Marcin Siodelski <marcin@isc.org>
Date: Fri, 18 Mar 2016 14:18:33 +0000 (+0100)
Subject: [master] Removed linking with gtest in libdhcpsrvtest.
X-Git-Tag: trac4248_base
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0795ac9d0e346917ff3e674e593edee464284d11;p=thirdparty%2Fkea.git

[master] Removed linking with gtest in libdhcpsrvtest.

This change was okayed on jabber by Thomas. The issue
occurred when static linking was enabled on OSX.

Linking a static lib from statically linked lib causes
various issues and isn't generally considered a good
idea.
---

diff --git a/src/lib/dhcpsrv/testutils/Makefile.am b/src/lib/dhcpsrv/testutils/Makefile.am
index 97ffcba62c..416056891a 100644
--- a/src/lib/dhcpsrv/testutils/Makefile.am
+++ b/src/lib/dhcpsrv/testutils/Makefile.am
@@ -5,10 +5,6 @@ AM_CPPFLAGS += $(BOOST_INCLUDES)
 
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
 
-if USE_STATIC_LINK
-AM_LDFLAGS = -static
-endif
-
 CLEANFILES = *.gcno *.gcda
 
 if HAVE_GTEST
@@ -26,7 +22,7 @@ libdhcpsrvtest_la_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 if HAVE_MYSQL
 libdhcpsrvtest_la_CPPFLAGS += $(MYSQL_CPPFLAGS)
 endif
-libdhcpsrvtest_la_LDFLAGS  = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
+libdhcpsrvtest_la_LDFLAGS  = $(AM_LDFLAGS)
 if HAVE_MYSQL
 libdhcpsrvtest_la_LDFLAGS  += $(MYSQL_LIBS)
 endif