github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-21 05:43:32 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #5924 from Chocobo1/travis

Browse source 
Update ax_boost_system.m4
This commit is contained in:
sledgehammer999 2016-11-10 14:58:04 +02:00 • committed by GitHub
commit 3afe1835c0
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.travis.yml
View file

@ -121,7 +121,6 @@ install:
brew update > /dev/null ; brew update > /dev/null ;
brew install colormake ccache ; brew install colormake ccache ;
brew outdated "pkg-config" || brew upgrade "pkg-config" ; brew outdated "pkg-config" || brew upgrade "pkg-config" ;
brew outdated "zlib" || brew upgrade "zlib" ;
# libtorrent-rasterbar 1.0.9 # libtorrent-rasterbar 1.0.9
brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/477d5060fa093883204d70323965375353e03084/Formula/libtorrent-rasterbar.rb ; brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/477d5060fa093883204d70323965375353e03084/Formula/libtorrent-rasterbar.rb ;

2
configure vendored
View file

@ -5101,7 +5101,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
int int
main () main ()
{ {
boost::system::system_category boost::system::error_category *a = 0;
; ;
return 0; return 0;
} }

5
m4/ax_boost_system.m4
View file

@ -31,7 +31,7 @@
# and this notice are preserved. This file is offered as-is, without any # and this notice are preserved. This file is offered as-is, without any
# warranty. # warranty.
#serial 17 #serial 18
AC_DEFUN([AX_BOOST_SYSTEM], AC_DEFUN([AX_BOOST_SYSTEM],
[ [
@ -68,9 +68,10 @@ AC_DEFUN([AX_BOOST_SYSTEM],
ax_cv_boost_system, ax_cv_boost_system,
[AC_LANG_PUSH([C++]) [AC_LANG_PUSH([C++])
CXXFLAGS_SAVE=$CXXFLAGS CXXFLAGS_SAVE=$CXXFLAGS
CXXFLAGS=
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/system/error_code.hpp>]], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/system/error_code.hpp>]],
[[boost::system::system_category]])], [[boost::system::error_category *a = 0;]])],
ax_cv_boost_system=yes, ax_cv_boost_system=no) ax_cv_boost_system=yes, ax_cv_boost_system=no)
CXXFLAGS=$CXXFLAGS_SAVE CXXFLAGS=$CXXFLAGS_SAVE
AC_LANG_POP([C++]) AC_LANG_POP([C++])