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 11:04:09-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).

  configure.in@stripped, 2006-07-07 11:04:08-04:00, cmiller@zippy.(none) +3 -2
    Add a more reliable "getconf" test for Linuxthreads.

# 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 11:04:10 -04:00
+++ 1.336/configure.in	2006-07-07 11:04:10 -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=`getconf GNU_LIBPTHREAD_VERSION | tr abcdefghijklmnopqrstuvwxyz
ABCDEFGHIJKLMNOPQRSTUVWXYZ |grep LINUXTHREADS | wc -l`
+    if test "$grepres" -gt 0 -o "$grepres" -gt 0
     then
       AC_MSG_RESULT("Found")
       AC_DEFINE(HAVE_LINUXTHREADS)