diff options
author | unknown <monty@mashka.mysql.fi> | 2002-09-22 10:35:15 +0300 |
---|---|---|
committer | unknown <monty@mashka.mysql.fi> | 2002-09-22 10:35:15 +0300 |
commit | 0ef398632c68e5a7aa5e72a5ebc154d965128834 (patch) | |
tree | 87e7f602b563d9a1ad9076e0470e9668a28469d5 /configure.in | |
parent | 55e5a6b815af5188da0777233dc822ba176fda4f (diff) | |
download | mariadb-git-0ef398632c68e5a7aa5e72a5ebc154d965128834.tar.gz |
Fixed bug in previous patch when using a libc with static nss
client/mysql.cc:
Fixed help text
mysql-test/t/rpl_rotate_logs.test:
Updated test
sql/sql_acl.cc:
comments and safety checks
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 5e88c696302..7711cce7c08 100644 --- a/configure.in +++ b/configure.in @@ -454,6 +454,8 @@ fi NOINST_LDFLAGS= static_nss="" +STATIC_NSS_FLAGS="" +OTHER_LIBC_LIB="" AC_ARG_WITH(other-libc, [ --with-other-libc=DIR Link against libc and other standard libraries installed in the specified non-standard location @@ -479,6 +481,7 @@ AC_ARG_WITH(other-libc, # 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" + OTHER_LIBC_LIB="-L$other_libc_lib" static_nss=1 else # this is a dirty hack. We if we detect static nss glibc in the special @@ -2390,7 +2393,7 @@ fi if test "$static_nss" = "1" then - LDFLAGS="$LDFLAGS -static -L$other_libc_lib " + LDFLAGS="$LDFLAGS -static $OTHER_LIBC_LIB" LIBS="$LIBS $STATIC_NSS_FLAGS" fi |