encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure script: fix recursive mutex test on Linux systems (thanks, Ozkan!).

This commit is contained in:
Ryan C. Gordon 2015-03-23 20:07:24 -04:00
parent c76130c9cc
commit ac2bb3f200
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@ -21916,6 +21916,7 @@ $as_echo_n "checking for recursive mutexes... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
#define _GNU_SOURCE 1
#include <pthread.h> #include <pthread.h>
int int
@ -21929,7 +21930,7 @@ main ()
return 0; return 0;
} }
_ACEOF _ACEOF
if ac_fn_c_try_compile "$LINENO"; then : if ac_fn_c_try_link "$LINENO"; then :
has_recursive_mutexes=yes has_recursive_mutexes=yes
@ -21937,12 +21938,14 @@ $as_echo "#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1" >>confdefs.h
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi fi
if test x$has_recursive_mutexes = xno; then if test x$has_recursive_mutexes = xno; then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
#define _GNU_SOURCE 1
#include <pthread.h> #include <pthread.h>
int int
@ -21956,7 +21959,7 @@ main ()
return 0; return 0;
} }
_ACEOF _ACEOF
if ac_fn_c_try_compile "$LINENO"; then : if ac_fn_c_try_link "$LINENO"; then :
has_recursive_mutexes=yes has_recursive_mutexes=yes
@ -21964,7 +21967,8 @@ $as_echo "#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP 1" >>confdefs.h
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_recursive_mutexes" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_recursive_mutexes" >&5
$as_echo "$has_recursive_mutexes" >&6; } $as_echo "$has_recursive_mutexes" >&6; }

6
configure.in
View File

@ -2424,7 +2424,8 @@ AC_HELP_STRING([--enable-pthread-sem], [use pthread semaphores [[default=yes]]])
AC_MSG_CHECKING(for recursive mutexes) AC_MSG_CHECKING(for recursive mutexes)
has_recursive_mutexes=no has_recursive_mutexes=no
if test x$has_recursive_mutexes = xno; then if test x$has_recursive_mutexes = xno; then
AC_TRY_COMPILE([ AC_TRY_LINK([
#define _GNU_SOURCE 1
#include <pthread.h> #include <pthread.h>
],[ ],[
pthread_mutexattr_t attr; pthread_mutexattr_t attr;
@ -2435,7 +2436,8 @@ AC_HELP_STRING([--enable-pthread-sem], [use pthread semaphores [[default=yes]]])
]) ])
fi fi
if test x$has_recursive_mutexes = xno; then if test x$has_recursive_mutexes = xno; then
AC_TRY_COMPILE([ AC_TRY_LINK([
#define _GNU_SOURCE 1
#include <pthread.h> #include <pthread.h>
],[ ],[
pthread_mutexattr_t attr; pthread_mutexattr_t attr;