Change the ordering of the lock method to what's been "standard"

for Apache 1.3. This change will affect Apache2.0 so an entry
in its CHANGES file will be added as well.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63195 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 11 insertions, 8 deletions

diff --git a/configure.in b/configure.in
index 1a76f1bf1..46dfc8020 100644
--- a/configure.in
+++ b/configure.in
@@ -1328,19 +1328,22 @@ APR_IFALLYES(header:pthread.h define:PTHREAD_PROCESS_SHARED dnl
 APR_IFALLYES(struct:pthread_rw, hasrwlockser="1", hasrwlockser="0")
 
 # See which lock mechanism we'll select by default on this system.
-# The last APR_DECIDE to execute sets the default
+# The last APR_DECIDE to execute sets the default.
+# At this stage, we match the ordering in Apache 1.3
+# which is (highest to lowest): pthread -> sysvsem -> fcntl -> flock
+#
 APR_BEGIN_DECISION([apr_lock implementation method])
-APR_IFALLYES(func:semget func:semctl define:SEM_UNDO,
-            APR_DECIDE(USE_SYSVSEM_SERIALIZE, [SysV IPC semget()]))
 APR_IFALLYES(func:flock define:LOCK_EX,
             APR_DECIDE(USE_FLOCK_SERIALIZE, [4.2BSD-style flock()]))
+APR_IFALLYES(header:fcntl.h define:F_SETLK,
+            APR_DECIDE(USE_FCNTL_SERIALIZE, [SVR4-style fcntl()]))
+APR_IFALLYES(func:semget func:semctl define:SEM_UNDO,
+            APR_DECIDE(USE_SYSVSEM_SERIALIZE, [SysV IPC semget()]))
 # note: the current APR use of shared mutex requires /dev/zero
 APR_IFALLYES(header:pthread.h define:PTHREAD_PROCESS_SHARED dnl
             func:pthread_mutexattr_setpshared dnl
             file:/dev/zero,
             APR_DECIDE(USE_PROC_PTHREAD_SERIALIZE, [pthread mutex]))
-APR_IFALLYES(header:fcntl.h define:F_SETLK,
-            APR_DECIDE(USE_FCNTL_SERIALIZE, [SVR4-style fcntl()]))
 if test "x$apr_lock_method" != "x"; then
     APR_DECISION_FORCE($apr_lock_method)
 fi
@@ -1355,12 +1358,12 @@ case $ac_decision in
     USE_FLOCK_SERIALIZE )
         flockser="1"
         ;;
-    USE_SYSVSEM_SERIALIZE )
-        sysvser="1"
-        ;;
     USE_FCNTL_SERIALIZE )
         fcntlser="1"
         ;;
+    USE_SYSVSEM_SERIALIZE )
+        sysvser="1"
+        ;;
     USE_PROC_PTHREAD_SERIALIZE )
         procpthreadser="1"
         ;;