1 --- mysql-5.1.21-beta/configure.in~ 2007-08-29 19:00:29.000000000 +0300
2 +++ mysql-5.1.21-beta/configure.in 2007-08-29 19:00:35.000000000 +0300
5 AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity))
7 -AC_CHECK_LIB(nsl_r, gethostbyname_r, [],
8 - AC_CHECK_LIB(nsl, gethostbyname_r))
9 -AC_CHECK_FUNC(gethostbyname_r)
10 +AC_CHECK_FUNC(gethostbyname_r, [],
11 + [AC_CHECK_LIB(nsl_r, gethostbyname_r, [],
12 + [AC_CHECK_LIB(nsl, gethostbyname_r)])])
14 AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
15 -AC_CHECK_FUNC(yp_get_default_domain, ,
16 - AC_CHECK_LIB(nsl, yp_get_default_domain))
17 AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open))
18 # This may get things to compile even if bind-8 is installed
19 AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind))
20 # Check if crypt() exists in libc or libcrypt, sets LIBS if needed
21 -AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt]))
23 +AC_CHECK_LIB(crypt, crypt, [LIBS="-lcrypt $LIBS"; LIBCRYPT="-lcrypt"])
25 +AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt]))
27 # See if we need a library for address lookup.
28 AC_SEARCH_LIBS(inet_aton, [socket nsl resolv])
30 --- mysql-5.1.21-beta/sql/Makefile.am~ 2007-08-29 18:58:33.000000000 +0300
31 +++ mysql-5.1.21-beta/sql/Makefile.am 2007-08-29 19:01:33.000000000 +0300
35 $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
36 - $(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@
37 + $(yassl_libs) $(openssl_libs) @LIBCRYPT@ @MYSQLD_EXTRA_LIBS@
39 noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \
40 item_strfunc.h item_timefunc.h \
41 --- mysql-5.1.26-rc/config/ac-macros/ssl.m4.orig 2008-07-01 00:35:01.000000000 +0200
42 +++ mysql-5.1.26-rc/config/ac-macros/ssl.m4 2008-08-25 19:53:00.258254465 +0200
45 # Try to link with openSSL libs in <location>
47 - openssl_libs="-L$location/lib/ -lssl -lcrypto"
48 + if test "$location" != "/usr"
50 + openssl_libs="-L$location/lib -lssl -lcrypto"
52 + openssl_libs="-lssl -lcrypto"
54 MYSQL_CHECK_SSL_DIR([$openssl_includes], [$openssl_libs])
56 if test "$mysql_ssl_found" == "no"