[master] Commented out BOOST_ASIO_DISABLE_THREADS

diff --git a/ChangeLog b/ChangeLog
index d70fc2f94d67bff5aa821fc24590955f56e48f76..8935378fa394456013b5a53f69a63d332b8c0a10 100644 (file)
--- 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 777ea8b02875aaf3c338a4f2fabd2aef4e732142..634bc9708598acbfb0b9a39fa9358f4c7e358f75 100644 (file)
--- 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 9550f3c368f6268c72dd4f582aab11b4801c081a..fe98f73f54990a311c1209b789057e987078bc4e 100644 (file)
--- 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