[3911a] Fixes for static link (still subject to #4004 issue)

diff --git a/src/bin/d2/Makefile.am b/src/bin/d2/Makefile.am
index 5fda213859b959d50c21c997f7df0fe9732d5cdb..b196ac042224cba17654e83d4cca4ec31d48006f 100644 (file)
--- a/src/bin/d2/Makefile.am
+++ b/src/bin/d2/Makefile.am
@@ -111,7 +111,7 @@ kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 kea_dhcp_ddns_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)
 
-kea_dhcp_ddns_LDFLAGS = $(CRYPTO_LDFLAGS)
+kea_dhcp_ddns_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS)
 if HAVE_MYSQL
 kea_dhcp_ddns_LDFLAGS += $(MYSQL_LIBS)
 endif

diff --git a/src/bin/dhcp4/Makefile.am b/src/bin/dhcp4/Makefile.am
index 95ce291e1492ab9265471c1466fa2c3ad17f8ef7..6339bc2f3dd893607c20cc3e2114664c7de0039c 100644 (file)
--- a/src/bin/dhcp4/Makefile.am
+++ b/src/bin/dhcp4/Makefile.am
@@ -89,7 +89,7 @@ kea_dhcp4_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 kea_dhcp4_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 kea_dhcp4_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)
 
-kea_dhcp4_LDFLAGS = $(CRYPTO_LDFLAGS)
+kea_dhcp4_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS)
 if HAVE_MYSQL
 kea_dhcp4_LDFLAGS += $(MYSQL_LIBS)
 endif

diff --git a/src/bin/dhcp4/tests/Makefile.am b/src/bin/dhcp4/tests/Makefile.am
index 0f07be9c78eea9c15c9e66fb7b8d2f0f6a181e31..5cfc1abb7ce04f19107bf02acb99906aa8edb6de 100644 (file)
--- a/src/bin/dhcp4/tests/Makefile.am
+++ b/src/bin/dhcp4/tests/Makefile.am
@@ -36,6 +36,10 @@ if USE_CLANGPP
 AM_CXXFLAGS += -Wno-unused-parameter
 endif
 
+if USE_STATIC_LINK
+AM_LDFLAGS = -static
+endif
+
 TESTS_ENVIRONMENT = \
         $(LIBTOOL) --mode=execute $(VALGRIND_COMMAND)
 

diff --git a/src/bin/dhcp6/Makefile.am b/src/bin/dhcp6/Makefile.am
index 60acfed5689a83253f29ee6b7b7340e2e9bca1be..e47c904ef3f2ca31dd9c3421627d47b7512c0ae7 100644 (file)
--- a/src/bin/dhcp6/Makefile.am
+++ b/src/bin/dhcp6/Makefile.am
@@ -90,7 +90,7 @@ kea_dhcp6_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 kea_dhcp6_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 kea_dhcp6_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)
 
-kea_dhcp6_LDFLAGS = $(CRYPTO_LDFLAGS)
+kea_dhcp6_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS)
 if HAVE_MYSQL
 kea_dhcp6_LDFLAGS += $(MYSQL_LIBS)
 endif

diff --git a/src/bin/dhcp6/tests/Makefile.am b/src/bin/dhcp6/tests/Makefile.am
index 9d7a820013332300eb976dfe48e7380590ca7218..47b9245b34a21221b8fece5ac3d92eb670fd9c44 100644 (file)
--- a/src/bin/dhcp6/tests/Makefile.am
+++ b/src/bin/dhcp6/tests/Makefile.am
@@ -37,6 +37,10 @@ if USE_CLANGPP
 AM_CXXFLAGS += -Wno-unused-parameter
 endif
 
+if USE_STATIC_LINK
+AM_LDFLAGS = -static
+endif
+
 TESTS_ENVIRONMENT = \
         $(LIBTOOL) --mode=execute $(VALGRIND_COMMAND)
 

diff --git a/src/bin/lfc/Makefile.am b/src/bin/lfc/Makefile.am
index a96131a4cf9a2b00661464d852aa759b807637c4..6730564a083938a3163c50d8a396685bf57d4398 100644 (file)
--- a/src/bin/lfc/Makefile.am
+++ b/src/bin/lfc/Makefile.am
@@ -75,7 +75,7 @@ kea_lfc_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 kea_lfc_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 kea_lfc_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)
 
-kea_lfc_LDFLAGS = $(CRYPTO_LDFLAGS)
+kea_lfc_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS)
 if HAVE_MYSQL
 kea_lfc_LDFLAGS += $(MYSQL_LIBS)
 endif

diff --git a/src/lib/dhcpsrv/tests/Makefile.am b/src/lib/dhcpsrv/tests/Makefile.am
index 908faf98b463839b891a10005cf4c3e14c913f95..adff53939930dee2e63f65bb9f431cb6c870b2c9 100644 (file)
--- a/src/lib/dhcpsrv/tests/Makefile.am
+++ b/src/lib/dhcpsrv/tests/Makefile.am
@@ -9,6 +9,10 @@ AM_CPPFLAGS += -DINSTALL_PROG=\"$(abs_top_srcdir)/install-sh\"
 
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
 
+if USE_STATIC_LINK
+AM_LDFLAGS = -static
+endif
+
 # Some versions of GCC warn about some versions of Boost regarding
 # missing initializer for members in its posix_time.
 # https://svn.boost.org/trac/boost/ticket/3477

diff --git a/src/lib/exceptions/tests/Makefile.am b/src/lib/exceptions/tests/Makefile.am
index 8006d1fad693df2cca14edafa806017daa4afd38..0e4d2293d5e280a9ef6155465acf377ac4797d49 100644 (file)
--- a/src/lib/exceptions/tests/Makefile.am
+++ b/src/lib/exceptions/tests/Makefile.am
@@ -16,7 +16,7 @@ TESTS += run_unittests
 run_unittests_SOURCES = run_unittests.cc
 run_unittests_SOURCES += exceptions_unittest.cc
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
-run_unittests_LDFLAGS = $(GTEST_LDFLAGS)
+run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 run_unittests_LDADD = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 run_unittests_LDADD += $(GTEST_LDADD)