bk commit into 5.0 tree (joerg:1.1888) BUG#9497

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.0 repository of joerg. When joerg 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
  1.1888 05/04/26 12:16:12 joerg@stripped +2 -0
  Post-merge fix of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497).

  include/my_global.h
    1.77 05/04/26 12:16:08 joerg@stripped +1 -0
    As we have a new CPP symbol, this should be "undef"ed explicitly.

  config/ac-macros/openssl.m4
    1.4 05/04/26 12:16:08 joerg@stripped +1 -1
    "Configure" variable 'IS_LINUX' renamed to 'TARGET_LINUX'.
    Manual merge: In 4.1, this was in 'acinclude.m4'.

# 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:	joerg
# Host:	trift2.
# Root:	/M50/merge-5.0

--- 1.3/config/ac-macros/openssl.m4	Sat Mar  5 22:10:03 2005
+++ 1.4/config/ac-macros/openssl.m4	Tue Apr 26 12:16:08 2005
@@ -44,7 +44,7 @@
  if test -z "$OPENSSL_LIB" -o -z "$OPENSSL_INCLUDE" ; then
    echo "Could not find an installation of OpenSSL"
    if test -n "$OPENSSL_LIB" ; then
-    if test "$IS_LINUX" = "true"; then
+    if test "$TARGET_LINUX" = "true"; then
       echo "Looks like you've forgotten to install OpenSSL development RPM"
     fi
    fi

--- 1.76/include/my_global.h	Tue Apr 26 12:03:33 2005
+++ 1.77/include/my_global.h	Tue Apr 26 12:16:08 2005
@@ -107,6 +107,7 @@
 #undef THREAD
 #undef HAVE_mit_thread
 #undef HAVE_LINUXTHREADS
+#undef HAVE_NPTL
 #undef HAVE_UNIXWARE7_THREADS
 #endif