bk commit into 5.1 tree (SergeyV:1.2057)

[sergeyv]

Below is the list of changes that have just been committed into a local
5.1 repository of sergeyv. When sergeyv 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.2057 06/01/16 17:28:24 SergeyV@selena. +2 -0
  Fixes problem introduced by non-portable thread library definition in client
  makefile.am. Instead of adding lpthread directly it is added $CLIENT_THREAD_LIBS,
  which is evaluated during configure.

  configure.in
    1.332 06/01/16 17:26:02 SergeyV@selena. +5 -0
    Added portable definition of thread libs for client makefile.am

  client/Makefile.am
    1.58 06/01/16 17:26:01 SergeyV@selena. +1 -1
    Added portable definition of thread libs in client makefile.am

# 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:	SergeyV
# Host:	selena.
# Root:	H:/MYSQL/src/#00000-mysql-5.1

--- 1.57/client/Makefile.am	2006-01-13 19:09:23 +03:00
+++ 1.58/client/Makefile.am	2006-01-16 17:26:01 +03:00
@@ -48,7 +48,7 @@
 				$(top_srcdir)/mysys/my_vle.c \
 				$(top_srcdir)/mysys/base64.c
 mysqlbinlog_LDADD =		$(LDADD) $(CXXLDFLAGS)
-mysqlslap_LDADD =		$(LDADD) $(CXXLDFLAGS) -lpthread
+mysqlslap_LDADD =		$(LDADD) $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS)
 mysqltestmanager_pwgen_SOURCES =   mysqlmanager-pwgen.c 
 mysqltestmanagerc_SOURCES=      mysqlmanagerc.c $(yassl_dummy_link_fix)
 mysqlcheck_SOURCES=             mysqlcheck.c $(yassl_dummy_link_fix)

--- 1.331/configure.in	2006-01-09 19:26:11 +03:00
+++ 1.332/configure.in	2006-01-16 17:26:02 +03:00
@@ -1420,6 +1420,7 @@
 if test "$with_named_thread" != "no"
 then
   LIBS="$with_named_thread $LIBS $with_named_thread"
+  CLIENT_THREAD_LIBS="$with_named_thread"
   with_posix_threads="yes"
   AC_MSG_RESULT("$with_named_thread")
 else
@@ -1436,6 +1437,7 @@
     AC_MSG_CHECKING("for pthread_create in -lpthread");
     ac_save_LIBS="$LIBS"
     LIBS="$LIBS -lpthread"
+    CLIENT_THREAD_LIBS="-lpthread"
     AC_TRY_LINK(
     [#include <pthread.h>],
     [ (void) pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
@@ -1444,6 +1446,7 @@
     if test "$with_posix_threads" = "no"
     then
       LIBS=" $ac_save_LIBS -lpthreads"
+      CLIENT_THREAD_LIBS="-lpthreads"
       AC_MSG_CHECKING("for pthread_create in -lpthreads");
       AC_TRY_LINK(
       [#include <pthread.h>],
@@ -1454,6 +1457,7 @@
       then
         # This is for FreeBSD
         LIBS="$ac_save_LIBS -pthread"
+        CLIENT_THREAD_LIBS="-pthread"
         AC_MSG_CHECKING("for pthread_create in -pthread");
         AC_TRY_LINK(
         [#include <pthread.h>],
@@ -2469,6 +2473,7 @@
 CLIENT_LIBS="$NON_THREADED_LIBS $openssl_libs $ZLIB_LIBS $STATIC_NSS_FLAGS"
 
 AC_SUBST(CLIENT_LIBS)
+AC_SUBST(CLIENT_THREAD_LIBS)
 AC_SUBST(NON_THREADED_LIBS)
 AC_SUBST(STATIC_NSS_FLAGS)
 AC_SUBST(sql_client_dirs)