bk commit into 5.1 tree (mtaylor:1.2583)

[Monty Taylor]

Below is the list of changes that have just been committed into a local
5.1 repository of mtaylor.  When mtaylor 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, 2008-04-26 17:19:44-07:00, mtaylor@solace.(none) +1 -0
  Reverted NSL_LIBS change. 

  configure.in@stripped, 2008-04-26 17:19:42-07:00, mtaylor@solace.(none) +3 -8
    Reverted NSL_LIBS change. 

diff -Nrup a/configure.in b/configure.in
--- a/configure.in	2008-04-25 16:09:44 -07:00
+++ b/configure.in	2008-04-26 17:19:42 -07:00
@@ -841,18 +841,14 @@ AC_CHECK_HEADERS([xfs/xfs.h])
 
 AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity))
 
-dnl Save the current libs into _libs so we can put this into NSL_LIBS
-_libs=${LIBS}
-LIBS=''
 AC_CHECK_LIB(nsl_r, gethostbyname_r, [],
   AC_CHECK_LIB(nsl, gethostbyname_r))
 AC_CHECK_FUNC(gethostbyname_r)
-AC_CHECK_FUNC(yp_get_default_domain, ,
-  AC_CHECK_LIB(nsl, yp_get_default_domain))
-NSL_LIBS=${LIBS}
-LIBS=${_libs}
+AC_CHECK_LIB(mtmalloc, malloc)
 
 AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
+AC_CHECK_FUNC(yp_get_default_domain, ,
+  AC_CHECK_LIB(nsl, yp_get_default_domain))
 AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open))
 # This may get things to compile even if bind-8 is installed
 AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind))
@@ -2684,7 +2680,6 @@ sql_client_dirs="$sql_client_dirs client
 
 CLIENT_LIBS="$NON_THREADED_LIBS $openssl_libs $ZLIB_LIBS $STATIC_NSS_FLAGS"
 
-AC_SUBST(NSL_LIBS)
 AC_SUBST(CLIENT_LIBS)
 AC_SUBST(CLIENT_THREAD_LIBS)
 AC_SUBST(NON_THREADED_LIBS)