diff options
| author | Francis Dupont <fdupont@isc.org> | 2015-09-04 10:42:21 +0200 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2015-09-04 10:42:21 +0200 |
| commit | 8175031f4b9e11edef8cf7cd8d5c1bb6eea69d93 (patch) | |
| tree | ba3c8ea09524a77a52c2c8e1c5f8816f0fbc39c8 /configure.ac | |
| parent | [4009] Added BOOST_ASIO_HEADER_ONLY define (diff) | |
| download | kea-8175031f4b9e11edef8cf7cd8d5c1bb6eea69d93.tar.xz kea-8175031f4b9e11edef8cf7cd8d5c1bb6eea69d93.zip | |
[4009] Fixed the libboost_system dependency for Boost < 1.56
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index d4b6ada3c5..972398f35c 100644 --- a/configure.ac +++ b/configure.ac @@ -1244,17 +1244,19 @@ AC_SUBST(GTEST_SOURCE) # Use our 'coroutine' header from ext CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/ext/coroutine" # -# Disable threads: Currently we don't use them. -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" -# # Doesn't seem to be required? CPPFLAGS="$CPPFLAGS -DBOOST_ASIO_HEADER_ONLY" +# +# Disable threads: Currently we don't use them. +CPPFLAGS="$CPPFLAGS -DBOOST_ASIO_DISABLE_THREADS=1" + +# We tried to stay header only +if test "x${BOOST_LIBS}" = "x"; then + # 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" +fi # Check for functions that are not available on all platforms AC_CHECK_FUNCS([pselect]) @@ -1573,6 +1575,7 @@ cat >> config.report << END Boost: BOOST_VERSION: ${BOOST_VERSION} BOOST_INCLUDES: ${BOOST_INCLUDES} + BOOST_LIBS: ${BOOST_LIBS} ${CRYPTO_NAME}: CRYPTO_VERSION: ${CRYPTO_VERSION} |