Don't try to use PROC_PTHREAD by default when cross compiling.

git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1873594 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 11 insertions, 2 deletions

diff --git a/CHANGES b/CHANGES
index 7c3edba58..8ad327fd4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                      -*- coding: utf-8 -*-
 Changes for APR 1.7.1
 
+  *) Don't try to use PROC_PTHREAD by default when cross compiling.
+     [Yann Ylavic]
+
   *) Add the ability to cross compile APR. [Graham Leggett]
 
   *) While cross-compiling, the tools/gen_test_char could not
diff --git a/configure.in b/configure.in
index 604add1c6..687cae2b2 100644
--- a/configure.in
+++ b/configure.in
@@ -2376,8 +2376,8 @@ APR_IFALLYES(func:semget func:semctl func:semop define:SEM_UNDO,
 APR_IFALLYES(header:OS.h func:create_sem func:acquire_sem func:acquire_sem_etc, 
             APR_DECIDE(USE_BEOSSEM, [BeOS Semaphores])) 
 # pthread mutex both pshared and robust[_np] is the best default
-case "$apr_cv_mutex_robust_shared" in
-"yes"|"np")
+case "$hasprocpthreadser:$apr_cv_mutex_robust_shared" in
+"1:yes" | "1:np")
     APR_DECIDE(USE_PROC_PTHREAD_SERIALIZE, [pthread pshared mutex]) 
     ;;
 *)
@@ -2396,21 +2396,27 @@ procpthreadser="0"
 fcntlser="0"
 case $ac_decision in
     USE_FLOCK_SERIALIZE )
+        hasflockser="1"
         flockser="1"
         ;;
     USE_FCNTL_SERIALIZE )
+        hasfcntlser="1"
         fcntlser="1"
         ;;
     USE_SYSVSEM_SERIALIZE )
+        hassysvser="1"
         sysvser="1"
         ;;
     USE_POSIXSEM_SERIALIZE )
+        hasposixser="1"
         posixser="1"
         ;;
     USE_PROC_PTHREAD_SERIALIZE )
+        hasprocpthreadser="1"
         procpthreadser="1"
         ;;
     USE_BEOSSEM )
+        hasbeossem="1"
         beossem="1"
         ;;
 esac