summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrantišek Dvořák <valtri@users.sourceforge.net>2005-07-26 21:44:51 +0000
committerFrantišek Dvořák <valtri@users.sourceforge.net>2005-07-26 21:44:51 +0000
commitd163679e10f7e28f6da554860810d3262eab2ff7 (patch)
tree4416aa3fac64d8e0281d4b1cc6da301fb15cbb1e
parent5cf037cf63434e03c1a2ff433ac49c5c9f78e562 (diff)
downloadxine-lib-d163679e10f7e28f6da554860810d3262eab2ff7.tar.gz
xine-lib-d163679e10f7e28f6da554860810d3262eab2ff7.tar.bz2
*BUGFIX*
Fixed win32 build. CVS patchset: 7685 CVS date: 2005/07/26 21:44:51
-rw-r--r--configure.ac19
1 files changed, 11 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index 3a0ac3163..67f9314d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -225,6 +225,7 @@ case "$host" in
esac
if test "$SYS" = "mingw32"; then
+ THREAD_CONFIGURE_CPPFLAGS="-I${srcdir}/win32/contrib/pthreads"
THREAD_INCLUDES='-I$(top_srcdir)/win32/contrib/pthreads'
THREAD_LIBS='$(top_builddir)/win32/contrib/pthreads/libpthread.la'
THREAD_CFLAGS_CONFIG=" "
@@ -269,20 +270,22 @@ dnl
AC_MSG_CHECKING(for recursive mutex support in pthread)
AC_DEFINE(_GNU_SOURCE)
have_recursive_mutex=no
-saved_libs="$LIBS"
-LIBS="$THREAD_LIBS"
-AC_TRY_LINK([
- #include <pthread.h>
- ],[
- pthread_mutexattr_t attr;
- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+saved_cppflags="$CPPFLAGS"
+CPPFLAGS="$THREAD_CONFIGURE_CPPFLAGS"
+AC_COMPILE_IFELSE([#include <pthread.h>
+
+int main() {
+ pthread_mutexattr_t attr;
+ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+ return 0;
+}
],[
have_recursive_mutex=yes
],[
AC_MSG_ERROR(recursive mutex support is needed - please report)
])
AC_MSG_RESULT($have_recursive_mutex)
-LIBS="$saved_libs"
+CPPFLAGS="$saved_cppflags"
dnl ---------------------------------------------