Revise usage of BOOST_NO_CXX11_RVALUE_REFERENCES

Now the flag will be present when building with boost version <= 1.59.
Closes #8990.
This commit is contained in:
Chocobo1 2018-06-01 00:31:16 +08:00 committed by sledgehammer999
commit b107b745f2
No known key found for this signature in database
GPG key ID: 6E4A2D025B7CC9A2
4 changed files with 47 additions and 1 deletions

View file

@ -168,6 +168,17 @@ AX_BOOST_BASE([1.35],
CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"
# add workaround for problematic boost version
AC_LANG_PUSH(C++)
# taken from ax_boost_base.m4
m4_define([DETECT_BOOST_VERSION_PROGRAM],
[AC_LANG_PROGRAM([[#include <boost/version.hpp>]],
[[(void) ((void)sizeof(char[1 - 2*!!((BOOST_VERSION) < ($1))]));]])])
AC_COMPILE_IFELSE([DETECT_BOOST_VERSION_PROGRAM(106000)], [],
[QBT_ADD_DEFINES="$QBT_ADD_DEFINES BOOST_NO_CXX11_RVALUE_REFERENCES"])
AC_LANG_POP([C++])
AX_BOOST_SYSTEM()
AC_MSG_NOTICE([Boost.System LIB: "$BOOST_SYSTEM_LIB"])
LIBS="$BOOST_SYSTEM_LIB $LIBS"