Use pthread rwlocks by default

(cherry picked from commit ad03c22e976411cad743bc02746b803a2f119df7)

diff --git a/aclocal.m4 b/aclocal.m4
index a3a11f5d29b02584a161495d10e5110b795e14d6..167140bbebc42ca84baa36022edc5349cf4ef66b 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -100,7 +100,7 @@ dnl Check to see whether a particular set of modules exists. Similar to
 dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
 dnl
 dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-dnl only at the first occurrence in configure.ac, so if the first place
+dnl only at the first occurence in configure.ac, so if the first place
 dnl it's called might be skipped (such as if it is within an "if", you
 dnl have to call PKG_CHECK_EXISTS manually
 AC_DEFUN([PKG_CHECK_EXISTS],

diff --git a/configure b/configure
index d9dbccebf55e2866d6417598d53f3675ff7dc063..40c3350c5df8b77891b564134b9d653dcc0f8d90 100755 (executable)
--- a/configure
+++ b/configure
@@ -1625,8 +1625,9 @@ Optional Features:
   --enable-devpoll        use /dev/poll when available [default=yes]
   --disable-geoip         support GeoIP2 geolocation ACLs if available
                           [default=yes]
-  --enable-pthread-rwlock use pthread rwlock instead of internal rwlock
-                          implementation (EXPERIMENTAL)
+  --disable-pthread-rwlock
+                          use internal rwlock implementation instead of
+                          pthread rwlock
   --enable-fips-mode      enable FIPS mode in OpenSSL library [default=no]
   --enable-native-pkcs11  use native PKCS11 for public-key crypto [default=no]
   --enable-backtrace      log stack backtrace on abort [default=yes]
@@ -16040,13 +16041,13 @@ esac
 
 
 #
-# Do we want to use pthread rwlock? (useful for ThreadSanitizer)
+# Do we want to use pthread rwlock?
 #
 # Check whether --enable-pthread_rwlock was given.
 if test "${enable_pthread_rwlock+set}" = set; then :
   enableval=$enable_pthread_rwlock;
 else
-  enable_pthread_rwlock=no
+  enable_pthread_rwlock=yes
 fi
 
 

diff --git a/configure.ac b/configure.ac
index 3847456ce472742f107635078711a5130a6e8400..dbe1c41314f250649d27e405a5b63586db225008 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -716,12 +716,12 @@ esac
 AC_SUBST(INSTALL_LIBRARY)
 
 #
-# Do we want to use pthread rwlock? (useful for ThreadSanitizer)
+# Do we want to use pthread rwlock?
 #
 AC_ARG_ENABLE([pthread_rwlock],
-             [AS_HELP_STRING([--enable-pthread-rwlock],
-                             [use pthread rwlock instead of internal rwlock implementation (EXPERIMENTAL)])],
-             [], [enable_pthread_rwlock=no])
+             [AS_HELP_STRING([--disable-pthread-rwlock],
+                             [use internal rwlock implementation instead of pthread rwlock])],
+             [], [enable_pthread_rwlock=yes])
 
 AS_IF([test "$enable_pthread_rwlock" = "yes"],
       [AC_CHECK_FUNCS([pthread_rwlock_rdlock], [],