diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-07-03 16:56:44 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-07-03 16:56:44 +0100 |
| commit | b70e34352e304cf03da32b688d84eec3c3ffacec (patch) | |
| tree | 711ec8d7abc0dd6075d09085634e5a5432e40ee3 /m4/pthreads.m4 | |
| parent | 08ad733e0103834bc61831ddce5a75c3f62e0173 (diff) | |
| parent | 2b0e330c2642081066316ca5ec9965912cd248de (diff) | |
| download | xine-lib-b70e34352e304cf03da32b688d84eec3c3ffacec.tar.gz xine-lib-b70e34352e304cf03da32b688d84eec3c3ffacec.tar.bz2 | |
Merge from 1.1.
Diffstat (limited to 'm4/pthreads.m4')
| -rw-r--r-- | m4/pthreads.m4 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/m4/pthreads.m4 b/m4/pthreads.m4 index 653a496da..8438cde0b 100644 --- a/m4/pthreads.m4 +++ b/m4/pthreads.m4 @@ -48,7 +48,6 @@ AC_DEFUN([CC_PTHREAD_FLAGS], [ [ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $cc_cv_werror $PTHREAD_CFLAGS" - LIBS="$LIBS $PTHREAD_LIBS" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -79,7 +78,9 @@ AC_DEFUN([CC_PTHREAD_RECURSIVE_MUTEX], [ AC_CACHE_CHECK( [for recursive mutex support in pthread], [cc_cv_pthread_recursive_mutex], - [ac_save_LIBS="$LIBS" + [ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $cc_cv_werror $PTHREAD_CFLAGS" LIBS="$LIBS $PTHREAD_LIBS" AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([ @@ -94,6 +95,7 @@ int main() { ], [cc_cv_pthread_recursive_mutex=yes], [cc_cv_pthread_recursive_mutex=no]) + CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" ]) |