Update posix thread version check to match against strings more likely

to be unique.

diff --git a/build/openldap.m4 b/build/openldap.m4
index 20db77d62a5d18b73b386d3c05bcd410094a8668..31439d60dad98cf6b521c5956d566473aad8b774 100644 (file)
--- a/build/openldap.m4
+++ b/build/openldap.m4
@@ -295,19 +295,19 @@ dnl               should be tested separately.
 dnl
 AC_DEFUN([OL_POSIX_THREAD_VERSION],
 [AC_CACHE_CHECK([POSIX thread version],[ol_cv_pthread_version],[
-       AC_EGREP_CPP(final,[
+       AC_EGREP_CPP(pthread_version_final,[
 #              include <pthread.h>
                /* this check could be improved */
 #              ifdef PTHREAD_ONCE_INIT
-                       final
+                       pthread_version_final
 #              endif
        ], ol_pthread_final=yes, ol_pthread_final=no)
 
-       AC_EGREP_CPP(draft4,[
+       AC_EGREP_CPP(pthread_version_draft4,[
 #              include <pthread.h>
                /* this check could be improved */
 #              ifdef pthread_once_init
-                       draft4
+                       pthread_version_draft4
 #              endif
        ], ol_pthread_draft4=yes, ol_pthread_draft4=no)
 

diff --git a/configure b/configure
index 2758dd668abccb61637c23a91c5665ea928683ab..fceb4fc3c1bd13ad1368ed3f28952ebfa3711c5a 100755 (executable)
--- a/configure
+++ b/configure
@@ -3308,12 +3308,12 @@ else
 #              include <pthread.h>
                /* this check could be improved */
 #              ifdef PTHREAD_ONCE_INIT
-                       final
+                       pthread_version_final
 #              endif
        
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "final" >/dev/null 2>&1; then
+  egrep "pthread_version_final" >/dev/null 2>&1; then
   rm -rf conftest*
   ol_pthread_final=yes
 else
@@ -3330,12 +3330,12 @@ rm -f conftest*
 #              include <pthread.h>
                /* this check could be improved */
 #              ifdef pthread_once_init
-                       draft4
+                       pthread_version_draft4
 #              endif
        
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "draft4" >/dev/null 2>&1; then
+  egrep "pthread_version_draft4" >/dev/null 2>&1; then
   rm -rf conftest*
   ol_pthread_draft4=yes
 else