From 9b7d4cce635e226f8a932576df22237c67321e5d Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Thu, 19 Apr 2018 08:55:44 +0300
Subject: [PATCH] configure: Use both check_header and check_lib for pthreads

check_lib can be a stub that always returns true - make sure to
still use check_headers as before 38dc27cc6.

Change-Id: I5d471de56b16c015a0b686fa6c6caefa35bb89b4
---
 build/make/configure.sh | 2 +-
 configure               | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build/make/configure.sh b/build/make/configure.sh
index 5efafdf95..876255bfe 100644
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -1491,7 +1491,7 @@ EOF
         # bionic includes basic pthread functionality, obviating -lpthread.
         ;;
       *)
-        check_lib -lpthread <<EOF && enable_feature pthread_h && add_extralibs -lpthread
+        check_header pthread.h && check_lib -lpthread <<EOF && enable_feature pthread_h && add_extralibs -lpthread
 #include <pthread.h>
 #include <stddef.h>
 int main(void) { return pthread_create(NULL, NULL, NULL, NULL); }
diff --git a/configure b/configure
index 3174a9f4b..b021c1212 100755
--- a/configure
+++ b/configure
@@ -582,7 +582,10 @@ process_detect() {
 int main(void) {return 0;}
 EOF
     # check system headers
-    check_lib -lpthread <<EOF && enable_feature pthread_h
+
+    # Use both check_header and check_lib here, since check_lib
+    # could be a stub that always returns true.
+    check_header pthread.h && check_lib -lpthread <<EOF && enable_feature pthread_h
 #include <pthread.h>
 #include <stddef.h>
 int main(void) { return pthread_create(NULL, NULL, NULL, NULL); }
-- 
2.40.0