Commit f2f6f6d3 authored by serg@build.mysql2.com's avatar serg@build.mysql2.com
Browse files

Merge work.mysql.com:/home/bk/mysql-4.0 

into build.mysql2.com:/home/serg/mysql-4.0
parents 108f2ccb 88ce8f68

BitKeeper/etc/logging_ok

+2 −1
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ root@x3.internalnet 
salle@geopard.(none)

salle@geopard.online.bg

sasha@mysql.sashanet.com

serg@build.mysql2.com

serg@serg.mysql.com

serg@sergbook.mysql.com

sinisa@rhols221.adsl.netsonic.fi
@@ -75,9 +76,9 @@ tonu@volk.internalnet 
tonu@x153.internalnet

tonu@x3.internalnet

venu@work.mysql.com

vva@genie.(none)

walrus@mysql.com

worm@altair.is.lan

zak@balfor.local

zak@linux.local

zgreant@mysql.com
 
vva@genie.(none)

configure.in

+4 −4
Original line number Diff line number Diff line
@@ -479,8 +479,8 @@ AC_ARG_WITH(other-libc, 
   then

     # libc has been compiled with --enable-static-nss

     # we need special flags, but we will have to add those later

     STATIC_NSS_FLAGS="-Wl,--start-group -lc -lnss_files -lnss_dns -lresolv \

  -Wl,--end-group"

     STATIC_NSS_FLAGS="-lc -lnss_files -lnss_dns -lresolv"

     STATIC_NSS_FLAGS="$STATIC_NSS_FLAGS $STATIC_NSS_FLAGS"

     OTHER_LIBC_LIB="-L$other_libc_lib"

     static_nss=1

   else
@@ -520,8 +520,8 @@ then 
  tmp=`nm /usr/lib/libc.a  | grep _nss_files_getaliasent_r`

  if test -n "$tmp"

  then

     STATIC_NSS_FLAGS="-Wl,--start-group -lc -lnss_files -lnss_dns -lresolv \

  -Wl,--end-group"

     STATIC_NSS_FLAGS="-lc -lnss_files -lnss_dns -lresolv"

     STATIC_NSS_FLAGS="$STATIC_NSS_FLAGS $STATIC_NSS_FLAGS"

     static_nss=1

  fi

fi