aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <egil@erlang.org>2012-11-21 17:24:28 +0100
committerBjörn-Egil Dahlberg <egil@erlang.org>2012-11-21 17:24:28 +0100
commit5f1a27641219db0f70988510ea0b917fb9985ef4 (patch)
tree92838b96d3a68a1dc7e1ffa2ad948fbdcf1a602d /erts
parentdd12df3bb0be7970259e22f10601b950c2e7976f (diff)
parent998ed368ed0630f2a1b202c046afad0022b3ccc6 (diff)
downloadotp-5f1a27641219db0f70988510ea0b917fb9985ef4.tar.gz
otp-5f1a27641219db0f70988510ea0b917fb9985ef4.tar.bz2
otp-5f1a27641219db0f70988510ea0b917fb9985ef4.zip
Merge branch 'maint'
Diffstat (limited to 'erts')
-rw-r--r--erts/aclocal.m410
1 files changed, 9 insertions, 1 deletions
diff --git a/erts/aclocal.m4 b/erts/aclocal.m4
index b1cf1fe404..9578cd35c4 100644
--- a/erts/aclocal.m4
+++ b/erts/aclocal.m4
@@ -740,11 +740,16 @@ dnl Try to find POSIX threads
dnl The usual pthread lib...
AC_CHECK_LIB(pthread, pthread_create, THR_LIBS="-lpthread")
-dnl FreeBSD has pthreads in special c library, c_r...
+dnl Very old versions of FreeBSD have pthreads in special c library, c_r...
if test "x$THR_LIBS" = "x"; then
AC_CHECK_LIB(c_r, pthread_create, THR_LIBS="-lc_r")
fi
+dnl QNX has pthreads in standard C library
+ if test "x$THR_LIBS" = "x"; then
+ AC_CHECK_FUNC(pthread_create, THR_LIBS="none_needed")
+ fi
+
dnl On ofs1 the '-pthread' switch should be used
if test "x$THR_LIBS" = "x"; then
AC_MSG_CHECKING([if the '-pthread' switch can be used])
@@ -765,6 +770,9 @@ dnl On ofs1 the '-pthread' switch should be used
if test "x$THR_LIBS" != "x"; then
THR_DEFS="$THR_DEFS -D_THREAD_SAFE -D_REENTRANT -DPOSIX_THREADS"
THR_LIB_NAME=pthread
+ if test "x$THR_LIBS" = "xnone_needed"; then
+ THR_LIBS=
+ fi
case $host_os in
solaris*)
THR_DEFS="$THR_DEFS -D_POSIX_PTHREAD_SEMANTICS" ;;