Commit 748e5c85 authored by Evan Hunt's avatar Evan Hunt
Browse files

- suppress unused-parameter warnings in src/bin/auth/asio_link.cc and

  src/lib/cc/session.cc that were triggered by ASIO code.
- move ext/boost and ext/asio each down one level, to ext/boost/boost
  and ext/asio/asio.  This allows groups of external headers to be
  included more selectively: we can switch on asio without also including
  boost, or change the boost include directory without losing asio.


git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac168@1952 e5f2f494-b856-4b98-b285-d166d9295462
parent aad8d399

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
...@@ -205,7 +205,7 @@ if test "$with_boost_system" != "no"; then ...@@ -205,7 +205,7 @@ if test "$with_boost_system" != "no"; then
LDFLAGS_SAVED="$LDFLAGS" LDFLAGS_SAVED="$LDFLAGS"
LIBS_SAVED="$LIBS" LIBS_SAVED="$LIBS"
CPPFLAGS_SAVED="$CPPFLAGS" CPPFLAGS_SAVED="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -Iext" CPPFLAGS="$CPPFLAGS -Iext/boost"
for BOOST_TRY_LIB in boost_system boost_system-mt; do for BOOST_TRY_LIB in boost_system boost_system-mt; do
LDFLAGS="$LDFLAGS_SAVED ${BOOST_LDFLAGS}" LDFLAGS="$LDFLAGS_SAVED ${BOOST_LDFLAGS}"
...@@ -340,19 +340,22 @@ AC_SUBST(GTEST_LDADD) ...@@ -340,19 +340,22 @@ AC_SUBST(GTEST_LDADD)
PKG_CHECK_MODULES(SQLITE, sqlite3 >= 3.3.9, enable_features="$enable_features SQLite3") PKG_CHECK_MODULES(SQLITE, sqlite3 >= 3.3.9, enable_features="$enable_features SQLite3")
# Use local ASIO headers from ext
CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/ext/asio"
# Check for headers from required devel kits. # Check for headers from required devel kits.
# boost/shared_ptr.hpp is in ext in svn but not in tarball. # boost/shared_ptr.hpp is in ext in svn but not in tarball.
CPPFLAGS_SAVED=$CPPFLAGS CPPFLAGS_SAVED=$CPPFLAGS
if test "X$BOOST_INCLUDES" = "X"; then if test "X$BOOST_INCLUDES" = "X"; then
# abs_top_srcdir not defined yet # abs_top_srcdir not defined yet
# so this is only useful to check. We'll replace it after the check. # so this is only useful to check. We'll replace it after the check.
CPPFLAGS="$CPPFLAGS -Iext" CPPFLAGS="$CPPFLAGS -Iext/boost"
fi fi
AC_CHECK_HEADERS([boost/shared_ptr.hpp boost/foreach.hpp],, AC_CHECK_HEADERS([boost/shared_ptr.hpp boost/foreach.hpp],,
AC_MSG_ERROR([Missing required header files.])) AC_MSG_ERROR([Missing required header files.]))
CPPFLAGS=$CPPFLAGS_SAVED CPPFLAGS=$CPPFLAGS_SAVED
if test "X$BOOST_INCLUDES" = "X"; then if test "X$BOOST_INCLUDES" = "X"; then
CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/ext" CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/ext/boost"
fi fi
AC_ARG_ENABLE(man, [AC_HELP_STRING([--enable-man], AC_ARG_ENABLE(man, [AC_HELP_STRING([--enable-man],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment