diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-02 11:13:08 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-02 11:13:08 +0200 |
| commit | c3594c6c050a987fb891a1c7cf0c83102fbbec46 (patch) | |
| tree | 33b215c07359fff941f32fc89a8cf3e968d334a9 /pixman/configure.ac | |
| parent | 1881d1a5c46cc9efb394f84b69f58c000ee1118b (diff) | |
| parent | 8092f320c341a6b3a1b428fdd4473859d5db8b79 (diff) | |
| download | vcxsrv-c3594c6c050a987fb891a1c7cf0c83102fbbec46.tar.gz vcxsrv-c3594c6c050a987fb891a1c7cf0c83102fbbec46.tar.bz2 vcxsrv-c3594c6c050a987fb891a1c7cf0c83102fbbec46.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman xkeyboard-config git update 2 Okt 2013
Conflicts:
mesalib/src/glsl/ast.h
mesalib/src/glsl/glsl_parser_extras.h
Diffstat (limited to 'pixman/configure.ac')
| -rw-r--r-- | pixman/configure.ac | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/pixman/configure.ac b/pixman/configure.ac index 263c63edf..2dd477663 100644 --- a/pixman/configure.ac +++ b/pixman/configure.ac @@ -961,37 +961,38 @@ main () ]])) AC_DEFUN([PIXMAN_CHECK_PTHREAD],[dnl - if test "z$support_for_pthread_setspecific" != "zyes"; then + if test "z$support_for_pthreads" != "zyes"; then PIXMAN_LINK_WITH_ENV( [$1], [pthread_test_program], [PTHREAD_CFLAGS="$CFLAGS" PTHREAD_LIBS="$LIBS" PTHREAD_LDFLAGS="$LDFLAGS" - support_for_pthread_setspecific=yes]) + support_for_pthreads=yes]) fi ]) -if test $ac_cv_tls = none ; then - support_for_pthread_setspecific=no +support_for_pthreads=no - AC_MSG_CHECKING(for pthread_setspecific) +AC_MSG_CHECKING(for pthreads) - PIXMAN_CHECK_PTHREAD([CFLAGS="-pthread"; LDFLAGS="-pthread"]) - PIXMAN_CHECK_PTHREAD([CFLAGS="-D_REENTRANT"; LIBS="-lpthread"]) - PIXMAN_CHECK_PTHREAD([CFLAGS="-D_REENTRANT"; LDFLAGS="-lroot"]) +PIXMAN_CHECK_PTHREAD([CFLAGS="-pthread"; LDFLAGS="-pthread"]) +PIXMAN_CHECK_PTHREAD([CFLAGS="-D_REENTRANT"; LIBS="-lpthread"]) +PIXMAN_CHECK_PTHREAD([CFLAGS="-D_REENTRANT"; LDFLAGS="-lroot"]) - if test $support_for_pthread_setspecific = yes; then - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - AC_DEFINE([HAVE_PTHREAD_SETSPECIFIC], [], [Whether pthread_setspecific() is supported]) +if test $support_for_pthreads = yes; then + AC_DEFINE([HAVE_PTHREADS], [], [Whether pthreads is supported]) + if test $ac_cv_tls = none ; then + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" fi - - AC_MSG_RESULT($support_for_pthread_setspecific); fi +AC_MSG_RESULT($support_for_pthreads) + AC_SUBST(TOOLCHAIN_SUPPORTS__THREAD) -AC_SUBST(HAVE_PTHREAD_SETSPECIFIC) +AC_SUBST(HAVE_PTHREADS) AC_SUBST(PTHREAD_LDFLAGS) AC_SUBST(PTHREAD_LIBS) +AC_SUBST(PTHREAD_CFLAGS) dnl ===================================== dnl __attribute__((constructor)) |