diff options
| author | Francis Dupont <fdupont@isc.org> | 2015-09-24 15:53:10 +0200 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2015-09-24 15:53:10 +0200 |
| commit | 96294e8cf5e2d7a2a32606b77128486efa38d0e4 (patch) | |
| tree | 3d1c82d62a52d894e872d13b3c3a5687495f55ed /configure.ac | |
| parent | [master] Merged trac4032 (improve unit tests for exceptions) (diff) | |
| parent | [4009] Improved new boost options doc (diff) | |
| download | kea-96294e8cf5e2d7a2a32606b77128486efa38d0e4.tar.xz kea-96294e8cf5e2d7a2a32606b77128486efa38d0e4.zip | |
[master] Finished merge of trac4009 (use Boost Asio vs. ext/asio)
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 00751c7338..702fee0a76 100644 --- a/configure.ac +++ b/configure.ac @@ -1241,15 +1241,22 @@ AC_SUBST(GTEST_SOURCE) # # ASIO: we extensively use it as the C++ event management module. # -# Use local ASIO headers from ext -# -CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/ext/asio" -# # Use our 'coroutine' header from ext CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/ext/coroutine" # +# Doesn't seem to be required? +CPPFLAGS="$CPPFLAGS -DBOOST_ASIO_HEADER_ONLY" +# # Disable threads: Currently we don't use them. -CPPFLAGS="$CPPFLAGS -DASIO_DISABLE_THREADS=1" +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]) @@ -1266,7 +1273,7 @@ AC_CHECK_FUNCS([pselect]) # code will be updated by the time we really need it. AC_CHECK_HEADERS(sys/devpoll.h, ac_cv_have_devpoll=yes, ac_cv_have_devpoll=no) if test "X$ac_cv_have_devpoll" = "Xyes" -a "X$GXX" = "Xyes"; then - CPPFLAGS="$CPPFLAGS -DASIO_DISABLE_DEV_POLL=1" + CPPFLAGS="$CPPFLAGS -DBOOST_ASIO_DISABLE_DEV_POLL=1" fi # @@ -1380,8 +1387,7 @@ AC_CONFIG_FILES([compatcheck/Makefile doc/guide/Makefile doc/Makefile doc/version.ent - ext/asio/asio/Makefile - ext/asio/Makefile + ext/coroutine/Makefile ext/gtest/Makefile ext/Makefile m4macros/Makefile @@ -1570,6 +1576,7 @@ cat >> config.report << END Boost: BOOST_VERSION: ${BOOST_VERSION} BOOST_INCLUDES: ${BOOST_INCLUDES} + BOOST_LIBS: ${BOOST_LIBS} ${CRYPTO_NAME}: CRYPTO_VERSION: ${CRYPTO_VERSION} |