Mesa (9.0): Re-add HAVE_PTHREADS preprocessor macro
Ian Romanick
idr at kemper.freedesktop.org
Fri Nov 2 19:23:37 UTC 2012
Module: Mesa
Branch: 9.0
Commit: 6a3c578dcd22e47944bee67d0e484ed1846f547c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6a3c578dcd22e47944bee67d0e484ed1846f547c
Author: Matt Turner <mattst88 at gmail.com>
Date: Thu Oct 11 10:57:26 2012 -0700
Re-add HAVE_PTHREADS preprocessor macro
Broken in commit 814345f54b.
NOTE: This is a candidate for the 9.0 branch.
(cherry picked from commit 9a51edfb5af72a7a480f408f02d8ecd98c576b7b)
---
configure.ac | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4746dcb..e7a7241 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,13 +160,13 @@ DEFINES=""
AC_SUBST([DEFINES])
case "$host_os" in
linux*|*-gnu*|gnu*)
- DEFINES="$DEFINES -D_GNU_SOURCE"
+ DEFINES="$DEFINES -D_GNU_SOURCE -DHAVE_PTHREAD"
;;
solaris*)
- DEFINES="$DEFINES -DSVR4"
+ DEFINES="$DEFINES -DHAVE_PTHREAD -DSVR4"
;;
cygwin*)
- DEFINES="$DEFINES"
+ DEFINES="$DEFINES -DHAVE_PTHREAD"
;;
esac
@@ -946,7 +946,7 @@ AC_ARG_ENABLE([glx-tls],
AC_SUBST(GLX_TLS, ${GLX_USE_TLS})
AS_IF([test "x$GLX_USE_TLS" = xyes -a "x$ax_pthread_ok" = xyes],
- [DEFINES="${DEFINES} -DGLX_USE_TLS"])
+ [DEFINES="${DEFINES} -DGLX_USE_TLS -DHAVE_PTHREAD"])
dnl
dnl More DRI setup
@@ -1030,7 +1030,7 @@ if test "x$enable_dri" = xyes; then
esac
;;
freebsd* | dragonfly* | *netbsd*)
- DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1"
+ DEFINES="$DEFINES -DHAVE_PTHREAD -DUSE_EXTERNAL_DXTN_LIB=1"
DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS"
if test "x$DRI_DIRS" = "xyes"; then
More information about the mesa-commit
mailing list