Commit 477ada0a authored by Satya B's avatar Satya B

merge to mysql-5.1-bugteam branch

parents 889b96b9 f383f648
...@@ -603,10 +603,11 @@ AC_SUBST(NOINST_LDFLAGS) ...@@ -603,10 +603,11 @@ AC_SUBST(NOINST_LDFLAGS)
# Check if we are using Linux and a glibc compiled with static nss # Check if we are using Linux and a glibc compiled with static nss
# (this is true on the MySQL build machines to avoid NSS problems) # (this is true on the MySQL build machines to avoid NSS problems)
# #
AC_CHECK_TOOL([NM], [nm])
if test "$TARGET_LINUX" = "true" -a "$static_nss" = "" if test "$TARGET_LINUX" = "true" -a "$static_nss" = ""
then then
tmp=`nm /usr/lib*/libc.a | grep _nss_files_getaliasent_r` tmp=`$NM ${other_libc_lib:-/usr/lib*}/libc.a | grep _nss_files_getaliasent_r1`
if test -n "$tmp" if test -n "$tmp"
then then
STATIC_NSS_FLAGS="-lc -lnss_files -lnss_dns -lresolv" STATIC_NSS_FLAGS="-lc -lnss_files -lnss_dns -lresolv"
......
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