mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-06-18 12:53:03 +02:00
build: AX_BOOST_THREAD serial 33
This commit is contained in:
parent
cf0681133a
commit
366913e307
@ -30,7 +30,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 32
|
#serial 33
|
||||||
|
|
||||||
AC_DEFUN([AX_BOOST_THREAD],
|
AC_DEFUN([AX_BOOST_THREAD],
|
||||||
[
|
[
|
||||||
@ -67,13 +67,24 @@ AC_DEFUN([AX_BOOST_THREAD],
|
|||||||
[AC_LANG_PUSH([C++])
|
[AC_LANG_PUSH([C++])
|
||||||
CXXFLAGS_SAVE=$CXXFLAGS
|
CXXFLAGS_SAVE=$CXXFLAGS
|
||||||
|
|
||||||
if test "x$host_os" = "xsolaris" ; then
|
case "x$host_os" in
|
||||||
|
xsolaris )
|
||||||
CXXFLAGS="-pthreads $CXXFLAGS"
|
CXXFLAGS="-pthreads $CXXFLAGS"
|
||||||
elif test "x$host_os" = "xmingw32" ; then
|
break;
|
||||||
|
;;
|
||||||
|
xmingw32 )
|
||||||
CXXFLAGS="-mthreads $CXXFLAGS"
|
CXXFLAGS="-mthreads $CXXFLAGS"
|
||||||
else
|
break;
|
||||||
|
;;
|
||||||
|
*android* )
|
||||||
|
break;
|
||||||
|
;;
|
||||||
|
* )
|
||||||
CXXFLAGS="-pthread $CXXFLAGS"
|
CXXFLAGS="-pthread $CXXFLAGS"
|
||||||
fi
|
break;
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
AC_COMPILE_IFELSE([
|
AC_COMPILE_IFELSE([
|
||||||
AC_LANG_PROGRAM(
|
AC_LANG_PROGRAM(
|
||||||
[[@%:@include <boost/thread/thread.hpp>]],
|
[[@%:@include <boost/thread/thread.hpp>]],
|
||||||
@ -84,13 +95,23 @@ AC_DEFUN([AX_BOOST_THREAD],
|
|||||||
AC_LANG_POP([C++])
|
AC_LANG_POP([C++])
|
||||||
])
|
])
|
||||||
if test "x$ax_cv_boost_thread" = "xyes"; then
|
if test "x$ax_cv_boost_thread" = "xyes"; then
|
||||||
if test "x$host_os" = "xsolaris" ; then
|
case "x$host_os" in
|
||||||
|
xsolaris )
|
||||||
BOOST_CPPFLAGS="-pthreads $BOOST_CPPFLAGS"
|
BOOST_CPPFLAGS="-pthreads $BOOST_CPPFLAGS"
|
||||||
elif test "x$host_os" = "xmingw32" ; then
|
break;
|
||||||
|
;;
|
||||||
|
xmingw32 )
|
||||||
BOOST_CPPFLAGS="-mthreads $BOOST_CPPFLAGS"
|
BOOST_CPPFLAGS="-mthreads $BOOST_CPPFLAGS"
|
||||||
else
|
break;
|
||||||
|
;;
|
||||||
|
*android* )
|
||||||
|
break;
|
||||||
|
;;
|
||||||
|
* )
|
||||||
BOOST_CPPFLAGS="-pthread $BOOST_CPPFLAGS"
|
BOOST_CPPFLAGS="-pthread $BOOST_CPPFLAGS"
|
||||||
fi
|
break;
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
AC_SUBST(BOOST_CPPFLAGS)
|
AC_SUBST(BOOST_CPPFLAGS)
|
||||||
|
|
||||||
@ -148,6 +169,9 @@ AC_DEFUN([AX_BOOST_THREAD],
|
|||||||
xmingw32 )
|
xmingw32 )
|
||||||
break;
|
break;
|
||||||
;;
|
;;
|
||||||
|
*android* )
|
||||||
|
break;
|
||||||
|
;;
|
||||||
* )
|
* )
|
||||||
BOOST_THREAD_LIB="$BOOST_THREAD_LIB -lpthread"
|
BOOST_THREAD_LIB="$BOOST_THREAD_LIB -lpthread"
|
||||||
break;
|
break;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user