From: Frantisek D. <va...@us...> - 2005-07-28 20:48:07
|
Update of /cvsroot/xine/xine-lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29236 Modified Files: Tag: xine-1_0 configure.ac Log Message: Retransmitted Windows build fixes from CVS HEAD. Index: configure.ac =================================================================== RCS file: /cvsroot/xine/xine-lib/configure.ac,v retrieving revision 1.304.2.9 retrieving revision 1.304.2.10 diff -u -r1.304.2.9 -r1.304.2.10 --- configure.ac 21 Jul 2005 02:57:52 -0000 1.304.2.9 +++ configure.ac 28 Jul 2005 20:47:59 -0000 1.304.2.10 @@ -225,6 +225,7 @@ 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 @@ 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="$CPPFLAGS $THREAD_CONFIGURE_CPPFLAGS" +AC_COMPILE_IFELSE(AC_LANG_SOURCE([#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 --------------------------------------------- |