pixman: Branch 'master'

[Jeremy Huddleston]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8a8aabf05c8e6c7b68b68c80e4e73877fd35ce78
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Fri Mar 16 11:37:23 2012 -0700

    configure.ac: Fix a copy-paste-o in TLS detection
    
    Regression from: a069da6c66da407cc52e1e92321d69c68fd6beb5
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
    Tested-by: Matt Turner <mattst88 at gmail.com>

diff --git a/configure.ac b/configure.ac
index ad0f3fa..1cf9eb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -807,7 +807,7 @@ int $kw test;], [], ac_cv_tls=$kw)
 AC_MSG_RESULT($ac_cv_tls)
 
 if test "$ac_cv_tls" != "none"; then
-    AC_DEFINE_UNQUOTED([TLS], $pixman_tls, [The compiler supported TLS storage class])
+    AC_DEFINE_UNQUOTED([TLS], $ac_cv_tls, [The compiler supported TLS storage class])
 fi
 
 dnl