bk commit into 4.0 tree (cmiller:1.2185)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
4.0 repository of cmiller. When cmiller does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-07-07 16:47:57-04:00, cmiller@zippy.(none) +1 -0
  Add a more reliable "getconf" test for Linuxthreads.  The later trees should already
  have a better test (and so this should be null-merged there).
  
  ALSO!  Make it so that it accepts NPTL as a valid _equivalent_ implementation.

  configure.in@stripped, 2006-07-07 16:47:56-04:00, cmiller@zippy.(none) +15 -6
    Add a more reliable "getconf" test for Linuxthreads.  The later trees should already
    have a better test (and so this should be null-merged there).
    
    ALSO!  Make it so that it accepts NPTL as a valid _equivalent_ implementation.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	cmiller
# Host:	zippy.(none)
# Root:	/home/cmiller/work/mysql/mysql-4.0__bug19006

--- 1.335/configure.in	2006-07-07 16:47:58 -04:00
+++ 1.336/configure.in	2006-07-07 16:47:58 -04:00
@@ -1241,8 +1241,9 @@
 then
   # Look for LinuxThreads.
   AC_MSG_CHECKING("LinuxThreads")
-    res=`grep Linuxthreads /usr/include/pthread.h 2>/dev/null | wc -l`
-    if test "$res" -gt 0
+    grepres=`grep Linuxthreads /usr/include/pthread.h 2>/dev/null | wc -l`
+    getconfres=`which getconf >/dev/null && getconf GNU_LIBPTHREAD_VERSION | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ |grep LINUXTHREADS | wc -l || echo 0`
+    if test "$grepres" -gt 0 -o "$getconfres" -gt 0
     then
       AC_MSG_RESULT("Found")
       AC_DEFINE(HAVE_LINUXTHREADS)
@@ -1255,12 +1256,20 @@
     else
       AC_MSG_RESULT("Not found")
       # If this is a linux machine we should barf
+      AC_MSG_CHECKING("NPTL")
       if test "$IS_LINUX" = "true"
       then
-	AC_MSG_ERROR([This is a linux system and Linuxthreads was not
-found. On linux Linuxthreads should be used.  Please install Linuxthreads
-(or a new glibc) and try again.  See the Installation chapter in the
-Reference Manual for more information.])
+        getconfres=`which getconf >/dev/null && getconf GNU_LIBPTHREAD_VERSION | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ |grep NPTL | wc -l || echo 0`
+        if test "$getconfres" -gt 0
+        then
+          AC_DEFINE(HAVE_LINUXTHREADS) dnl All this code predates NPTL, so "have linuxthreads" is a poor name.
+          with_named_thread="-lpthread"
+        else
+          AC_MSG_ERROR([This is a Linux system and neither Linuxthreads nor NPTL were
+found. Please install Linuxthreads or a new glibc and try 
+again.  See the Installation chapter in the Reference Manual for 
+more information.])
+        fi
       else
 	AC_MSG_CHECKING("DEC threads")
         if test -f /usr/shlib/libpthread.so -a -f /usr/lib/libmach.a -a -f /usr/ccs/lib/cmplrs/cc/libexc.a