diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-06-14 16:25:38 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-06-14 16:25:38 +0200 |
| commit | 97049a8985f7f9cadff0d61d65961c5cfd490829 (patch) | |
| tree | 32db874d5040bc0a42f20b5a9f5adc1712471373 /m4 | |
| parent | 7ae03d031828b8595ef6a441717b3b5402f6ce0d (diff) | |
| parent | 9f35b93d3ee2a40444c538247cfc5b05b4b0bf89 (diff) | |
| download | xine-lib-97049a8985f7f9cadff0d61d65961c5cfd490829.tar.gz xine-lib-97049a8985f7f9cadff0d61d65961c5cfd490829.tar.bz2 | |
Merge from 1.1 branch.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/pthreads.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/m4/pthreads.m4 b/m4/pthreads.m4 index 826dbc72b..d29f0d660 100644 --- a/m4/pthreads.m4 +++ b/m4/pthreads.m4 @@ -22,7 +22,7 @@ AC_DEFUN([CC_PTHREAD_FLAGS], [ *-darwin*) PTHREAD_CFLAGS="" ;; *-solaris*) # Handle Studio compiler - CC_CHECK_CFLAGS([-mt], [PTHREAD_CFLAGS="-mt -D_REENTRANT"], [PTHREAD_CFLAGS="-D_REENTRANT"]);; + CC_CHECK_CFLAGS([-mt], [PTHREAD_CFLAGS="-mt"]);; *) PTHREAD_CFLAGS="-pthread" ;; esac fi @@ -31,8 +31,8 @@ AC_DEFUN([CC_PTHREAD_FLAGS], [ *-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"]);; + # Use the same libraries for gcc and sun studio cc + PTHREAD_LIBS="-lpthread -lposix4 -lrt";; *) PTHREAD_LIBS="-pthread" ;; esac fi |