diff options
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | configure.in | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index aae42cf286f..2e089f1b96a 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -29,3 +29,4 @@ sinisa@rhols221.adsl.netsonic.fi zak@balfor.local bar@bar.mysql.r18.ru paul@teton.kitebird.com +serg@build.mysql2.com diff --git a/configure.in b/configure.in index 4c59bd284d4..1feca507489 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 |