Skip to content

Commit 366913e

Browse files
committed
build: AX_BOOST_THREAD serial 33
1 parent cf06811 commit 366913e

File tree

1 file changed

+39
-15
lines changed

1 file changed

+39
-15
lines changed

build-aux/m4/ax_boost_thread.m4

Lines changed: 39 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
# and this notice are preserved. This file is offered as-is, without any
3131
# warranty.
3232

33-
#serial 32
33+
#serial 33
3434

3535
AC_DEFUN([AX_BOOST_THREAD],
3636
[
@@ -67,13 +67,24 @@ AC_DEFUN([AX_BOOST_THREAD],
6767
[AC_LANG_PUSH([C++])
6868
CXXFLAGS_SAVE=$CXXFLAGS
6969
70-
if test "x$host_os" = "xsolaris" ; then
71-
CXXFLAGS="-pthreads $CXXFLAGS"
72-
elif test "x$host_os" = "xmingw32" ; then
73-
CXXFLAGS="-mthreads $CXXFLAGS"
74-
else
75-
CXXFLAGS="-pthread $CXXFLAGS"
76-
fi
70+
case "x$host_os" in
71+
xsolaris )
72+
CXXFLAGS="-pthreads $CXXFLAGS"
73+
break;
74+
;;
75+
xmingw32 )
76+
CXXFLAGS="-mthreads $CXXFLAGS"
77+
break;
78+
;;
79+
*android* )
80+
break;
81+
;;
82+
* )
83+
CXXFLAGS="-pthread $CXXFLAGS"
84+
break;
85+
;;
86+
esac
87+
7788
AC_COMPILE_IFELSE([
7889
AC_LANG_PROGRAM(
7990
[[@%:@include <boost/thread/thread.hpp>]],
@@ -84,13 +95,23 @@ AC_DEFUN([AX_BOOST_THREAD],
8495
AC_LANG_POP([C++])
8596
])
8697
if test "x$ax_cv_boost_thread" = "xyes"; then
87-
if test "x$host_os" = "xsolaris" ; then
88-
BOOST_CPPFLAGS="-pthreads $BOOST_CPPFLAGS"
89-
elif test "x$host_os" = "xmingw32" ; then
90-
BOOST_CPPFLAGS="-mthreads $BOOST_CPPFLAGS"
91-
else
92-
BOOST_CPPFLAGS="-pthread $BOOST_CPPFLAGS"
93-
fi
98+
case "x$host_os" in
99+
xsolaris )
100+
BOOST_CPPFLAGS="-pthreads $BOOST_CPPFLAGS"
101+
break;
102+
;;
103+
xmingw32 )
104+
BOOST_CPPFLAGS="-mthreads $BOOST_CPPFLAGS"
105+
break;
106+
;;
107+
*android* )
108+
break;
109+
;;
110+
* )
111+
BOOST_CPPFLAGS="-pthread $BOOST_CPPFLAGS"
112+
break;
113+
;;
114+
esac
94115
95116
AC_SUBST(BOOST_CPPFLAGS)
96117
@@ -148,6 +169,9 @@ AC_DEFUN([AX_BOOST_THREAD],
148169
xmingw32 )
149170
break;
150171
;;
172+
*android* )
173+
break;
174+
;;
151175
* )
152176
BOOST_THREAD_LIB="$BOOST_THREAD_LIB -lpthread"
153177
break;

0 commit comments

Comments
 (0)