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

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

into build.mysql2.com:/home/serg/mysql-4.0
parents 108f2ccb 88ce8f68
...@@ -58,6 +58,7 @@ root@x3.internalnet ...@@ -58,6 +58,7 @@ root@x3.internalnet
salle@geopard.(none) salle@geopard.(none)
salle@geopard.online.bg salle@geopard.online.bg
sasha@mysql.sashanet.com sasha@mysql.sashanet.com
serg@build.mysql2.com
serg@serg.mysql.com serg@serg.mysql.com
serg@sergbook.mysql.com serg@sergbook.mysql.com
sinisa@rhols221.adsl.netsonic.fi sinisa@rhols221.adsl.netsonic.fi
...@@ -75,9 +76,9 @@ tonu@volk.internalnet ...@@ -75,9 +76,9 @@ tonu@volk.internalnet
tonu@x153.internalnet tonu@x153.internalnet
tonu@x3.internalnet tonu@x3.internalnet
venu@work.mysql.com venu@work.mysql.com
vva@genie.(none)
walrus@mysql.com walrus@mysql.com
worm@altair.is.lan worm@altair.is.lan
zak@balfor.local zak@balfor.local
zak@linux.local zak@linux.local
zgreant@mysql.com zgreant@mysql.com
vva@genie.(none)
...@@ -479,8 +479,8 @@ AC_ARG_WITH(other-libc, ...@@ -479,8 +479,8 @@ AC_ARG_WITH(other-libc,
then then
# libc has been compiled with --enable-static-nss # libc has been compiled with --enable-static-nss
# we need special flags, but we will have to add those later # we need special flags, but we will have to add those later
STATIC_NSS_FLAGS="-Wl,--start-group -lc -lnss_files -lnss_dns -lresolv \ STATIC_NSS_FLAGS="-lc -lnss_files -lnss_dns -lresolv"
-Wl,--end-group" STATIC_NSS_FLAGS="$STATIC_NSS_FLAGS $STATIC_NSS_FLAGS"
OTHER_LIBC_LIB="-L$other_libc_lib" OTHER_LIBC_LIB="-L$other_libc_lib"
static_nss=1 static_nss=1
else else
...@@ -520,8 +520,8 @@ then ...@@ -520,8 +520,8 @@ then
tmp=`nm /usr/lib/libc.a | grep _nss_files_getaliasent_r` tmp=`nm /usr/lib/libc.a | grep _nss_files_getaliasent_r`
if test -n "$tmp" if test -n "$tmp"
then then
STATIC_NSS_FLAGS="-Wl,--start-group -lc -lnss_files -lnss_dns -lresolv \ STATIC_NSS_FLAGS="-lc -lnss_files -lnss_dns -lresolv"
-Wl,--end-group" STATIC_NSS_FLAGS="$STATIC_NSS_FLAGS $STATIC_NSS_FLAGS"
static_nss=1 static_nss=1
fi fi
fi fi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment