mirror of
https://github.com/qbittorrent/qBittorrent.git
synced 2024-12-15 08:01:05 +08:00
Remove outdated build configuration
This commit is contained in:
parent
5ebbed8160
commit
dca69f053a
@ -37,8 +37,6 @@ DEFINES += BOOST_ALL_NO_LIB
|
|||||||
# Use one of the following options
|
# Use one of the following options
|
||||||
DEFINES += BOOST_SYSTEM_STATIC_LINK
|
DEFINES += BOOST_SYSTEM_STATIC_LINK
|
||||||
#DEFINES += BOOST_SYSTEM_DYN_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
|
# Enable if libtorrent was built with this flag defined
|
||||||
#DEFINES += TORRENT_NO_DEPRECATE
|
#DEFINES += TORRENT_NO_DEPRECATE
|
||||||
|
19
configure
vendored
19
configure
vendored
@ -6020,25 +6020,6 @@ LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"
|
|||||||
# taken from ax_boost_base.m4
|
# taken from ax_boost_base.m4
|
||||||
|
|
||||||
|
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
/* end confdefs.h. */
|
|
||||||
#include <boost/version.hpp>
|
|
||||||
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
|
pkg_failed=no
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libtorrent-rasterbar >= 2.0.4" >&5
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libtorrent-rasterbar >= 2.0.4" >&5
|
||||||
|
@ -187,9 +187,6 @@ m4_define([DETECT_BOOST_VERSION_PROGRAM],
|
|||||||
[AC_LANG_PROGRAM([[#include <boost/version.hpp>]],
|
[AC_LANG_PROGRAM([[#include <boost/version.hpp>]],
|
||||||
[[(void) ((void)sizeof(char[1 - 2*!!((BOOST_VERSION) < ($1))]));]])])
|
[[(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,
|
PKG_CHECK_MODULES(libtorrent,
|
||||||
[libtorrent-rasterbar >= 2.0.4],
|
[libtorrent-rasterbar >= 2.0.4],
|
||||||
[CXXFLAGS="$libtorrent_CFLAGS $CXXFLAGS" LIBS="$libtorrent_LIBS $LIBS" QBT_ADD_DEFINES="$QBT_ADD_DEFINES QBT_USES_LIBTORRENT2"],
|
[CXXFLAGS="$libtorrent_CFLAGS $CXXFLAGS" LIBS="$libtorrent_LIBS $LIBS" QBT_ADD_DEFINES="$QBT_ADD_DEFINES QBT_USES_LIBTORRENT2"],
|
||||||
|
Loading…
Reference in New Issue
Block a user