diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-22 08:31:31 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-22 08:31:31 +0200 |
| commit | b318686d7779dab877e5fb33b7d97034cf8f44a8 (patch) | |
| tree | 8fd256304d1aac04400eead7b5f54743c472f233 /pixman/configure.ac | |
| parent | 63f9a2c22dbac3e52e4d875bd70d729de5f81a43 (diff) | |
| parent | 34d741a3fc96c9424ffec29b114a1bdfde40f8b0 (diff) | |
| download | vcxsrv-b318686d7779dab877e5fb33b7d97034cf8f44a8.tar.gz vcxsrv-b318686d7779dab877e5fb33b7d97034cf8f44a8.tar.bz2 vcxsrv-b318686d7779dab877e5fb33b7d97034cf8f44a8.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 mesa pixman git update 22 oct 2012
Diffstat (limited to 'pixman/configure.ac')
| -rw-r--r-- | pixman/configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pixman/configure.ac b/pixman/configure.ac index c069b483c..f9c0e0276 100644 --- a/pixman/configure.ac +++ b/pixman/configure.ac @@ -89,6 +89,9 @@ AC_DEFUN([PIXMAN_LINK_WITH_ENV],[dnl LDFLAGS="" LIBS="" $1 + CFLAGS="$save_CFLAGS $CFLAGS" + LDFLAGS="$save_LDFLAGS $LDFLAGS" + LIBS="$save_LIBS $LIBS" AC_LINK_IFELSE( [AC_LANG_SOURCE([$2])], [pixman_cc_stderr=`test -f conftest.err && cat conftest.err` @@ -921,8 +924,8 @@ if test $ac_cv_tls = none ; then AC_MSG_CHECKING(for pthread_setspecific) - PIXMAN_CHECK_PTHREAD([CFLAGS="-D_REENTRANT"; LIBS="-lpthread"]) 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 |