diff options
author | unknown <serg@build.mysql2.com> | 2002-09-23 16:39:18 +0200 |
---|---|---|
committer | unknown <serg@build.mysql2.com> | 2002-09-23 16:39:18 +0200 |
commit | d2083add3aa4a719dc589f7eda9c338f5e270926 (patch) | |
tree | 3e9c8114c4d1621f47a24e7a5939634dbbf76466 /configure.in | |
parent | 21afbc4c57e384ebebff1a6c91b3ba23afdcdeb8 (diff) | |
parent | 41f7307a18a1f6bdb8326ec28508614fc1b28afe (diff) | |
download | mariadb-git-d2083add3aa4a719dc589f7eda9c338f5e270926.tar.gz |
Merge
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
sql/sql_yacc.yy:
merged
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 7711cce7c08..8c3f06445c2 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 |