]>
Commit | Line | Data |
---|---|---|
1c828cdb ER |
1 | --- mysql-5.0.56/configure.in~ 2008-04-07 09:44:34.000000000 +0300 |
2 | +++ mysql-5.0.56/configure.in 2008-04-07 12:23:29.657592515 +0300 | |
3 | @@ -826,9 +826,9 @@ | |
d451850c | 4 | |
bbc0ff50 JB |
5 | AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity)) |
6 | ||
7 | -AC_CHECK_LIB(nsl_r, gethostbyname_r, [], | |
8 | - AC_CHECK_LIB(nsl, gethostbyname_r)) | |
9 | -AC_CHECK_FUNC(gethostbyname_r) | |
823380c5 | 10 | +AC_CHECK_FUNC(gethostbyname_r, [], |
2be2bff1 AM |
11 | + [AC_CHECK_LIB(nsl_r, gethostbyname_r, [], |
12 | + [AC_CHECK_LIB(nsl, gethostbyname_r)])]) | |
bbc0ff50 JB |
13 | |
14 | AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt)) | |
1c828cdb ER |
15 | AC_CHECK_FUNC(yp_get_default_domain, , |
16 | @@ -837,7 +837,11 @@ | |
bbc0ff50 JB |
17 | # This may get things to compile even if bind-8 is installed |
18 | AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind)) | |
923c2da0 ER |
19 | # Check if crypt() exists in libc or libcrypt, sets LIBS if needed |
20 | -AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt])) | |
bbc0ff50 | 21 | +save_LIBS="$LIBS" |
bbc0ff50 JB |
22 | +AC_CHECK_LIB(crypt, crypt, [LIBS="-lcrypt $LIBS"; LIBCRYPT="-lcrypt"]) |
23 | +AC_SUBST(LIBCRYPT) | |
2be2bff1 | 24 | +AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt])) |
bbc0ff50 | 25 | +LIBS="$save_LIBS" |
1c828cdb ER |
26 | # See if we need a library for address lookup. |
27 | AC_SEARCH_LIBS(inet_aton, [socket nsl resolv]) | |
bbc0ff50 | 28 | |
b0120dd7 ER |
29 | --- mysql-5.0.51/sql/Makefile.am~ 2007-12-06 22:13:15.000000000 +0200 |
30 | +++ mysql-5.0.51/sql/Makefile.am 2007-12-06 22:14:55.492574255 +0200 | |
31 | @@ -43,7 +43,7 @@ | |
32 | @innodb_system_libs@ \ | |
f7ba939a | 33 | @ndbcluster_libs@ @ndbcluster_system_libs@ \ |
48d72527 | 34 | $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \ |
b0120dd7 ER |
35 | - $(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@ |
36 | + $(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@ @LIBCRYPT@ | |
ab43c1fa | 37 | |
bbc0ff50 JB |
38 | noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ |
39 | item_strfunc.h item_timefunc.h item_uniq.h \ |