From: Francis Dupont <fdupont@isc.org>
Date: Mon, 11 Jun 2018 13:04:45 +0000 (+0200)
Subject: [master] Commented out BOOST_ASIO_DISABLE_THREADS
X-Git-Tag: 136-add-global-host-reservation-examples_base~4^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3fc8b1a4257a42a97aaf88a36287bbe33d1f65b;p=thirdparty%2Fkea.git

[master] Commented out BOOST_ASIO_DISABLE_THREADS
---

diff --git a/ChangeLog b/ChangeLog
index d70fc2f94d..8935378fa3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1422.	[build]		fdupont
+	Commented out BOOST_ASIO_DISABLE_THREADS in configure to reflect
+	the current use of threads by boost ASIO in Kea.
+	(Trac #5615, git xxx)
+
 1421.	[build]		marcin
 	Moved libdhcp_ha (High Availability) hooks library from
 	premium to main Kea repository and changed its license to
diff --git a/configure.ac b/configure.ac
index 777ea8b028..634bc97085 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1176,7 +1176,8 @@ fi
 CPPFLAGS="$CPPFLAGS -DBOOST_ASIO_HEADER_ONLY"
 #
 # Disable threads: they seems to break things on some systems
-CPPFLAGS="$CPPFLAGS -DBOOST_ASIO_DISABLE_THREADS=1"
+# As now we use threads in boost ASIO this is commented out...
+# CPPFLAGS="$CPPFLAGS -DBOOST_ASIO_DISABLE_THREADS=1"
 
 # We tried to stay header only
 if test "x${BOOST_LIBS}" = "x"; then
diff --git a/doc/guide/hooks-radius.xml b/doc/guide/hooks-radius.xml
index 9550f3c368..fe98f73f54 100644
--- a/doc/guide/hooks-radius.xml
+++ b/doc/guide/hooks-radius.xml
@@ -233,7 +233,7 @@ C++ Compiler:
   CXX_VERSION:     g++ (GCC) 4.8.5 20150623 (Red Hat 4.8.5-16)
   CXX_STANDARD:    201103
   DEFS:            -DHAVE_CONFIG_H
-  CPPFLAGS:         -DOS_LINUX  -DBOOST_ASIO_HEADER_ONLY -DBOOST_ASIO_DISABLE_THREADS=1
+  CPPFLAGS:         -DOS_LINUX  -DBOOST_ASIO_HEADER_ONLY
   CXXFLAGS:        -g -O2
   LDFLAGS:          -lpthread
   KEA_CXXFLAGS:     -Wall -Wextra -Wnon-virtual-dtor -Wwrite-strings -Woverloaded-virtual -Wno-sign-compare -pthread -Wno-missing-field-initializers -fPIC