diff --git a/conf.pri.windows b/conf.pri.windows index 88cd406c3..8b665695c 100644 --- a/conf.pri.windows +++ b/conf.pri.windows @@ -37,8 +37,6 @@ DEFINES += BOOST_ALL_NO_LIB # Use one of the following options DEFINES += BOOST_SYSTEM_STATIC_LINK #DEFINES += BOOST_SYSTEM_DYN_LINK -# Enable if encountered build error with boost version <= 1.59 -#DEFINES += BOOST_NO_CXX11_RVALUE_REFERENCES # Enable if libtorrent was built with this flag defined #DEFINES += TORRENT_NO_DEPRECATE diff --git a/configure b/configure index 237fe6ed9..e4f3090d0 100755 --- a/configure +++ b/configure @@ -6020,25 +6020,6 @@ LDFLAGS="$BOOST_LDFLAGS $LDFLAGS" # taken from ax_boost_base.m4 -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main (void) -{ -(void) ((void)sizeof(char[1 - 2*!!((BOOST_VERSION) < (106000))])); - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : - -else $as_nop - QBT_ADD_DEFINES="$QBT_ADD_DEFINES BOOST_NO_CXX11_RVALUE_REFERENCES" -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - pkg_failed=no { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libtorrent-rasterbar >= 2.0.4" >&5 diff --git a/configure.ac b/configure.ac index 0067aa9db..ea5ef2832 100644 --- a/configure.ac +++ b/configure.ac @@ -187,9 +187,6 @@ m4_define([DETECT_BOOST_VERSION_PROGRAM], [AC_LANG_PROGRAM([[#include ]], [[(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"]) - PKG_CHECK_MODULES(libtorrent, [libtorrent-rasterbar >= 2.0.4], [CXXFLAGS="$libtorrent_CFLAGS $CXXFLAGS" LIBS="$libtorrent_LIBS $LIBS" QBT_ADD_DEFINES="$QBT_ADD_DEFINES QBT_USES_LIBTORRENT2"],