mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-29 21:18:02 +00:00
Code Issues Releases Wiki Activity

Merge #3049

Browse Source 
Fix configure test for offset_ptr warnings.
This commit is contained in:
Michal 'vorner' Vaner 2013-08-19 12:41:46 +02:00
commit 55f0a8f3f5
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -883,7 +883,7 @@ LIBS=$LIBS_SAVED
AX_BOOST_FOR_BIND10 AX_BOOST_FOR_BIND10
# Boost offset_ptr is required in one library and not optional right now, so # Boost offset_ptr is required in one library and not optional right now, so
# we unconditionally fail here if it doesn't work. # we unconditionally fail here if it doesn't work.
if test "$BOOST_OFFSET_PTR_WOULDFAIL" = "yes"; then if test "$BOOST_OFFSET_PTR_WOULDFAIL" = "yes" -a "$werror_ok" = 1; then
AC_MSG_ERROR([Failed to compile a required header file. Try upgrading Boost to 1.44 or higher (when using clang++) or specifying --without-werror. See the ChangeLog entry for Trac no. 2147 for more details.]) AC_MSG_ERROR([Failed to compile a required header file. Try upgrading Boost to 1.44 or higher (when using clang++) or specifying --without-werror. See the ChangeLog entry for Trac no. 2147 for more details.])
fi fi

3
m4macros/ax_boost_for_bind10.m4
View File

@ -86,6 +86,8 @@ AC_TRY_COMPILE([
# Boost offset_ptr is known to not compile on some platforms, depending on # Boost offset_ptr is known to not compile on some platforms, depending on
# boost version, its local configuration, and compiler. Detect it. # boost version, its local configuration, and compiler. Detect it.
CXXFLAGS_SAVED="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -Werror"
AC_MSG_CHECKING([Boost offset_ptr compiles]) AC_MSG_CHECKING([Boost offset_ptr compiles])
AC_TRY_COMPILE([ AC_TRY_COMPILE([
#include <boost/interprocess/offset_ptr.hpp> #include <boost/interprocess/offset_ptr.hpp>
@ -94,6 +96,7 @@ AC_TRY_COMPILE([
BOOST_OFFSET_PTR_WOULDFAIL=no], BOOST_OFFSET_PTR_WOULDFAIL=no],
[AC_MSG_RESULT(no) [AC_MSG_RESULT(no)
BOOST_OFFSET_PTR_WOULDFAIL=yes]) BOOST_OFFSET_PTR_WOULDFAIL=yes])
CXXFLAGS="$CXXFLAGS_SAVED"
# Detect build failure case known to happen with Boost installed via # Detect build failure case known to happen with Boost installed via
# FreeBSD ports # FreeBSD ports