diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-22 08:28:32 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-22 08:28:32 +0200 |
| commit | 34d741a3fc96c9424ffec29b114a1bdfde40f8b0 (patch) | |
| tree | d879a3545ce91989c4fa621001eb7a44b2244cec /pixman/configure.ac | |
| parent | ded57b5a4131a213d57f5a20d50b819b7a8924df (diff) | |
| download | vcxsrv-34d741a3fc96c9424ffec29b114a1bdfde40f8b0.tar.gz vcxsrv-34d741a3fc96c9424ffec29b114a1bdfde40f8b0.tar.bz2 vcxsrv-34d741a3fc96c9424ffec29b114a1bdfde40f8b0.zip | |
libX11 mesa pixman git update 22 oct 2012
libX11: f2a8def423a46d52e834cf7ea49fa0079427663a
mesa: 259fc154f1fdcabbc0a6c02c524962b063f9dee6
pixman: 31e5a0a393defb8e0534ab1bde29ab23fc04795d
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 |