From: Francis Dupont <fdupont@isc.org>
Date: Wed, 2 Sep 2015 20:28:02 +0000 (+0200)
Subject: [4009] Fixed the boost_system dependency
X-Git-Tag: trac4060_base~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d7c8e1aa32fe717a8e31def0daa9c46142279d27;p=thirdparty%2Fkea.git

[4009] Fixed the boost_system dependency
---

diff --git a/configure.ac b/configure.ac
index 0d1378af43..51b392197f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1245,7 +1245,13 @@ AC_SUBST(GTEST_SOURCE)
 CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/ext/coroutine"
 #
 # Disable threads: Currently we don't use them.
-CPPFLAGS="$CPPFLAGS -DASIO_DISABLE_THREADS=1"
+CPPFLAGS="$CPPFLAGS -DBOOST_ASIO_DISABLE_THREADS=1"
+#
+# Don't want boost system library
+CPPFLAGS="$CPPFLAGS -DBOOST_ERROR_CODE_HEADER_ONLY"
+#
+# Avoid boost::system::throws multiple defines
+CPPFLAGS="$CPPFLAGS -DBOOST_SYSTEM_NO_DEPRECATED"
 
 # Check for functions that are not available on all platforms
 AC_CHECK_FUNCS([pselect])
diff --git a/src/lib/asiolink/Makefile.am b/src/lib/asiolink/Makefile.am
index 4e7a492da3..53f960f18b 100644
--- a/src/lib/asiolink/Makefile.am
+++ b/src/lib/asiolink/Makefile.am
@@ -35,8 +35,7 @@ libkea_asiolink_la_SOURCES += udp_socket.h
 # KEA_CXXFLAGS)
 libkea_asiolink_la_CXXFLAGS = $(AM_CXXFLAGS)
 libkea_asiolink_la_CPPFLAGS = $(AM_CPPFLAGS)
-libkea_asiolink_la_LIBADD  = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-libkea_asiolink_la_LIBADD += -lboost_system
+libkea_asiolink_la_LIBADD = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 
 # IOAddress is sometimes used in user-library code
 libkea_asiolink_includedir = $(pkgincludedir)/asiolink
diff --git a/src/lib/cc/Makefile.am b/src/lib/cc/Makefile.am
index a4f5ef8786..debe2ee8a6 100644
--- a/src/lib/cc/Makefile.am
+++ b/src/lib/cc/Makefile.am
@@ -9,7 +9,6 @@ libkea_cc_la_SOURCES = data.cc data.h
 libkea_cc_la_SOURCES += command_interpreter.cc command_interpreter.h
 
 libkea_cc_la_LIBADD  = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-libkea_cc_la_LIBADD += -lboost_system
 
 libkea_cc_la_LDFLAGS = -no-undefined -version-info 1:0:0