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, ,
17 # This may get things to compile even if bind-8 is installed
18 AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind))
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]))
22 +AC_CHECK_LIB(crypt, crypt, [LIBS="-lcrypt $LIBS"; LIBCRYPT="-lcrypt"])
24 +AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt]))
27 # For the sched_yield() function on Solaris
28 AC_CHECK_FUNC(sched_yield, , AC_CHECK_LIB(posix4, sched_yield))
29 --- mysql-5.0.21/libmysql_r/Makefile.am~ 2006-05-02 16:55:15.179229923 +0300
30 +++ mysql-5.0.21/libmysql_r/Makefile.am 2006-05-02 16:56:08.080408785 +0300
32 include $(top_srcdir)/libmysql/Makefile.shared
34 nodist_libmysqlclient_r_la_SOURCES = $(target_sources)
35 -libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_las)
36 +libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_las) @LIBS@
37 libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
40 --- mysql-5.1.21-beta/sql/Makefile.am~ 2007-08-29 18:58:33.000000000 +0300
41 +++ mysql-5.1.21-beta/sql/Makefile.am 2007-08-29 19:01:33.000000000 +0300
45 $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
46 - $(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@
47 + $(yassl_libs) $(openssl_libs) @LIBCRYPT@ @MYSQLD_EXTRA_LIBS@
49 noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \
50 item_strfunc.h item_timefunc.h \