drm: Branch 'master'

 configure.ac |   20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

New commits:
commit 63120172668610cebfd01e89f67e73037037dfd9
Author: Emil Velikov <[email protected]>
Date:   Thu Mar 30 18:01:12 2017 +0100

    configure.ac: bring back pthread-stubs check
    
    Accidentally removed with earlier commit. Although rather than simply
    adding the check for all platforms, use the same heuristics as we do in
    mesa.
    
    Namely: pthread-stubs is a thing only for BSD platforms. Everyone else
    should have lightweight pthread API in their C runtime library.
    
    Fixes: 4ecd1ef010b ("xf86drm: fix null termination of string buffer")
    Signed-off-by: Emil Velikov <[email protected]>
    Reviewed-by: Eric Engestrom <[email protected]>

diff --git a/configure.ac b/configure.ac
index 6a60ffc6..f1a13090 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,10 +61,22 @@ AC_CHECK_HEADERS([sys/sysctl.h sys/select.h])
 LT_PREREQ([2.2])
 LT_INIT([disable-static])
 
-
-
-AC_SUBST(PTHREADSTUBS_CFLAGS)
-AC_SUBST(PTHREADSTUBS_LIBS)
+dnl pthread-stubs is mandatory on BSD platforms, due to the nature of the
+dnl project. Even then there's a notable issue as described in the project README
+case "$host_os" in
+linux* | cygwin* | darwin* | solaris* | gnu*)
+    pthread_stubs_possible="no"
+    ;;
+* )
+    pthread_stubs_possible="yes"
+    ;;
+esac
+
+if test "x$pthread_stubs_possible" = xyes; then
+    PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs >= 0.4)
+    AC_SUBST(PTHREADSTUBS_CFLAGS)
+    AC_SUBST(PTHREADSTUBS_LIBS)
+fi
 
 pkgconfigdir=${libdir}/pkgconfig
 AC_SUBST(pkgconfigdir)

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
--