4590. [bug] Support for PTHREAD_MUTEX_ADAPTIVE_NP was not being

                        properly detected. [RT #44871]

(cherry picked from commit 88740c7fce1daf99664f41a41b49b01da167eaad)

diff --git a/CHANGES b/CHANGES
index 5861d62c46cbccb8ba70d7111d3d3631caae2135..8c6370ed69aafba94c6114045fe5f273b511cc47 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4590.  [bug]           Support for PTHREAD_MUTEX_ADAPTIVE_NP was not being
+                       properly detected. [RT #44871]
+
 4589.  [cleanup]       "configure -q" is now silent. [RT #44829]
 
 4588.  [bug]           nsupdate could send queries for TKEY to the wrong

diff --git a/configure b/configure
index e96fdb28d36108d36ec4e052dd5a5268b4b6e054..770b3c354ff3a0f7b2b573b847b76901ee561dab 100755 (executable)
--- a/configure
+++ b/configure
@@ -949,7 +949,6 @@ infodir
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -1101,7 +1100,6 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1354,15 +1352,6 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1500,7 +1489,7 @@ fi
 for ac_var in  exec_prefix prefix bindir sbindir libexecdir datarootdir \
                datadir sysconfdir sharedstatedir localstatedir includedir \
                oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-               libdir localedir mandir runstatedir
+               libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1653,7 +1642,6 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -15397,14 +15385,16 @@ $as_echo_n "checking for PTHREAD_MUTEX_ADAPTIVE_NP... " >&6; }
                         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-                          #define _GNU_SOURCE
-                          #include <pthread.h>
+                         #ifndef _GNU_SOURCE
+                         #define _GNU_SOURCE
+                         #endif
+                         #include <pthread.h>
 
 int
 main ()
 {
 
-                          return (PTHREAD_MUTEX_ADAPTIVE_NP);
+                         return (PTHREAD_MUTEX_ADAPTIVE_NP);
 
   ;
   return 0;

diff --git a/configure.in b/configure.in
index f88b698bdd93d1dbdca03c7aac80fbd7db3d4298..9fe30acdead2ee7cf3cddb45a9d90a3125421c72 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1263,10 +1263,12 @@ then
                         AC_MSG_CHECKING([for PTHREAD_MUTEX_ADAPTIVE_NP])
 
                         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-                          #define _GNU_SOURCE
-                          #include <pthread.h>
+                         #ifndef _GNU_SOURCE
+                         #define _GNU_SOURCE
+                         #endif
+                         #include <pthread.h>
                         ]], [[
-                          return (PTHREAD_MUTEX_ADAPTIVE_NP);
+                         return (PTHREAD_MUTEX_ADAPTIVE_NP);
                         ]])],
                         [ AC_MSG_RESULT(using adaptive lock type)
                           AC_DEFINE([HAVE_PTHREAD_MUTEX_ADAPTIVE_NP], 1,