diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index c61cab617baf81ae8fcfabe7b50a597835c74f98..942ea88713a305f6c84171ae9532e95053f3a371 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -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) diff --git a/configure.in b/configure.in index 7711cce7c08cb8881904c1b5aaa3a647c66fc3a1..8c3f06445c2fa78fbd641c645a25098c1d8c36f5 100644 --- a/configure.in +++ b/configure.in @@ -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