diff options
| author | marha <marha@users.sourceforge.net> | 2011-07-15 11:32:48 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-07-15 11:32:48 +0200 |
| commit | 3fbadc13acf6beb4a2497970367e2c2c1b6039ca (patch) | |
| tree | 44bc51faf9ba2bf08022a268f1a85c55fc4431ca /libX11/configure.ac | |
| parent | 4b424e0ba999b47ca62298e8104f76f940aac4d8 (diff) | |
| parent | 2ce12f084113a0097fa1a0d67e2f8fe1ab70092b (diff) | |
| download | vcxsrv-3fbadc13acf6beb4a2497970367e2c2c1b6039ca.tar.gz vcxsrv-3fbadc13acf6beb4a2497970367e2c2c1b6039ca.tar.bz2 vcxsrv-3fbadc13acf6beb4a2497970367e2c2c1b6039ca.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libX11/configure.ac
mesalib/configs/linux-dri
mesalib/docs/download.html
mesalib/src/SConscript
mesalib/src/mesa/main/bufferobj.c
mesalib/src/mesa/main/bufferobj.h
mesalib/src/mesa/main/framebuffer.c
mesalib/src/mesa/main/renderbuffer.c
mesalib/src/mesa/main/renderbuffer.h
mesalib/src/mesa/main/texobj.c
mesalib/src/mesa/program/program.c
mesalib/src/mesa/vbo/vbo_exec_array.c
xorg-server/dix/window.c
xorg-server/xkb/xkb.c
xorg-server/xkb/xkmread.c
Diffstat (limited to 'libX11/configure.ac')
| -rw-r--r-- | libX11/configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libX11/configure.ac b/libX11/configure.ac index 8bd2e51e0..60a7790d8 100644 --- a/libX11/configure.ac +++ b/libX11/configure.ac @@ -279,7 +279,7 @@ AM_CONDITIONAL(THRSTUBS, test x$thrstubs = xyes) # XXX incomplete, please fill this in
if test x$xthreads = xyes ; then
case $host_os in
- linux*|openbsd*|gnu*|k*bsd*-gnu)
+ linux*|gnu*|k*bsd*-gnu)
XTHREADLIB=-lpthread ;;
netbsd*)
XTHREAD_CFLAGS="-D_POSIX_THREAD_SAFE_FUNCTIONS"
@@ -287,7 +287,7 @@ if test x$xthreads = xyes ; then freebsd*)
XTHREAD_CFLAGS="-D_THREAD_SAFE"
XTHREADLIB="-pthread" ;;
- dragonfly*)
+ dragonfly*|openbsd*)
XTHREADLIB="-pthread" ;;
solaris*)
XTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" ;;
|