diff --git a/CHANGES b/CHANGES index bb160c039a627248edc5e3b3f605512bc55b819b..1550160bc2ec2104d66177f3440997a88d80a9e5 100644 --- 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 257057d7ec5ccc20d29938e43f0d9ad90c152877..ebdf11dc4112097da3f7ebab98413bf9a1aea695 100755 --- a/configure +++ b/configure @@ -955,7 +955,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -1111,7 +1110,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}' @@ -1364,15 +1362,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=* \ @@ -1510,7 +1499,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. @@ -1663,7 +1652,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] @@ -15451,14 +15439,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 + #ifndef _GNU_SOURCE + #define _GNU_SOURCE + #endif + #include int main () { - return (PTHREAD_MUTEX_ADAPTIVE_NP); + return (PTHREAD_MUTEX_ADAPTIVE_NP); ; return 0; diff --git a/configure.in b/configure.in index 2ac60b567cc1c3c9eb487b79361b39cdf1ed03a4..3d16a106ed8a2255076a10196cd4892dbb0aa2ef 100644 --- a/configure.in +++ b/configure.in @@ -1270,10 +1270,12 @@ then AC_MSG_CHECKING([for PTHREAD_MUTEX_ADAPTIVE_NP]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #define _GNU_SOURCE - #include + #ifndef _GNU_SOURCE + #define _GNU_SOURCE + #endif + #include ]], [[ - 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,