diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-06-12 22:32:26 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-06-12 22:32:26 +0100 |
| commit | 58d9467d1b2188463b216b79b51a423559e97a75 (patch) | |
| tree | 233624f3ae7213c376b6b293160b153061ed7e43 /m4 | |
| parent | aba1fd253b3a2c5cfa13e13eefea469e4e3dff9b (diff) | |
| parent | 125e98b02c9d62e09e154f176aacc2b9c51fd164 (diff) | |
| download | xine-lib-58d9467d1b2188463b216b79b51a423559e97a75.tar.gz xine-lib-58d9467d1b2188463b216b79b51a423559e97a75.tar.bz2 | |
A nice simple merge from 1.1.
Hopefully, I've applied all of the $(LTLIBINTL) changes correctly...
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/pthreads.m4 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/m4/pthreads.m4 b/m4/pthreads.m4 index d68cd13c8..826dbc72b 100644 --- a/m4/pthreads.m4 +++ b/m4/pthreads.m4 @@ -20,6 +20,9 @@ AC_DEFUN([CC_PTHREAD_FLAGS], [ case $host in *-hpux11*) PTHREAD_CFLAGS="" ;; *-darwin*) PTHREAD_CFLAGS="" ;; + *-solaris*) + # Handle Studio compiler + CC_CHECK_CFLAGS([-mt], [PTHREAD_CFLAGS="-mt -D_REENTRANT"], [PTHREAD_CFLAGS="-D_REENTRANT"]);; *) PTHREAD_CFLAGS="-pthread" ;; esac fi @@ -27,6 +30,9 @@ AC_DEFUN([CC_PTHREAD_FLAGS], [ case $host in *-hpux11*) PTHREAD_LIBS="-lpthread" ;; *-darwin*) PTHREAD_LIBS="" ;; + *-solaris*) + # Handle Studio compiler + CC_CHECK_CFLAGS([-mt], [PTHREAD_LIBS="-lpthread -lposix4 -lrt"], [PTHREAD_LIBS="-lpthread -lposix4 -lrt"]);; *) PTHREAD_LIBS="-pthread" ;; esac fi |