Mercurial > mplayer.hg
changeset 29128:af00bd66ccf6
Move thread-related CFLAGS settings into pthread test.
| author | diego |
|---|---|
| date | Fri, 10 Apr 2009 17:39:44 +0000 |
| parents | d22a57af2835 |
| children | fe379c71cb53 |
| files | configure |
| diffstat | 1 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Fri Apr 10 15:55:38 2009 +0000 +++ b/configure Fri Apr 10 17:39:44 2009 +0000 @@ -3288,6 +3288,11 @@ def_threads='#define HAVE_THREADS 0' echocheck "pthread" +if linux ; then + THREAD_CFLAGS=-D_REENTRANT +elif freebsd || netbsd || openbsd || bsdos ; then + THREAD_CFLAGS=-D_THREAD_SAFE +fi if test "$_pthreads" = auto ; then cat > $TMPC << EOF #include <pthread.h> @@ -3298,7 +3303,7 @@ if ! hpux ; then for _ld_tmp in "-lpthreadGC2" "" "-lpthread" "-pthread" ; do # for crosscompilation, we cannot execute the program, be happy if we can link statically - cc_check $_ld_tmp && (tmp_run || test "$_ld_static") && _ld_pthread="$_ld_tmp" && _pthreads=yes && break + cc_check $THREAD_CFLAGS $_ld_tmp && (tmp_run || test "$_ld_static") && _ld_pthread="$_ld_tmp" && _pthreads=yes && break done fi fi @@ -3306,6 +3311,7 @@ test $_ld_pthread && _res_comment="using $_ld_pthread" def_pthreads='#define HAVE_PTHREADS 1' def_threads='#define HAVE_THREADS 1' + extra_cflags="$extra_cflags $THREAD_CFLAGS" else _res_comment="v4l, v4l2, ao_nas, win32 loader disabled" def_pthreads='#undef HAVE_PTHREADS' @@ -8000,13 +8006,6 @@ ############################################################################# -# Thread support -if linux ; then - CFLAGS="$CFLAGS -D_REENTRANT" -elif freebsd || netbsd || openbsd || bsdos ; then - # FIXME bsd needs this so maybe other OS'es - CFLAGS="$CFLAGS -D_THREAD_SAFE" -fi # 64 bit file offsets? if test "$_largefiles" = yes || freebsd ; then CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"