diff options
| author | Francis Dupont <fdupont@isc.org> | 2018-06-11 15:04:45 +0200 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2018-06-11 15:04:45 +0200 |
| commit | f3fc8b1a4257a42a97aaf88a36287bbe33d1f65b (patch) | |
| tree | 55be5550bca0b9835d5ac3becad5758ebc5f0071 | |
| parent | [5646] Dedicated checks for truncated client-id, server-id added (diff) | |
| download | kea-f3fc8b1a4257a42a97aaf88a36287bbe33d1f65b.tar.xz kea-f3fc8b1a4257a42a97aaf88a36287bbe33d1f65b.zip | |
[master] Commented out BOOST_ASIO_DISABLE_THREADS
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | doc/guide/hooks-radius.xml | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -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 |