1 --- mysql-5.0.41.org/configure.in 2007-05-02 16:39:58.000000000 +0200
2 +++ mysql-5.0.41/configure.in 2007-05-10 15:02:12.075664162 +0200
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]))
22 -AC_SEARCH_LIBS(inet_aton, [socket nsl resolv])
24 +AC_CHECK_LIB(crypt, crypt, [LIBS="-lcrypt $LIBS"; LIBCRYPT="-lcrypt"])
26 +AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt]))
29 # For the sched_yield() function on Solaris
30 AC_CHECK_FUNC(sched_yield, , AC_CHECK_LIB(posix4, sched_yield))
31 --- mysql-5.0.41.org/libmysql_r/Makefile.am 2007-05-02 16:39:59.000000000 +0200
32 +++ mysql-5.0.41/libmysql_r/Makefile.am 2007-05-10 15:00:11.721844431 +0200
34 include $(top_srcdir)/libmysql/Makefile.shared
36 libmysqlclient_r_la_SOURCES = $(target_sources)
37 -libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_las)
38 +libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_las) -lpthread
39 libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
41 # This is called from the toplevel makefile
42 --- mysql-5.0.51/sql/Makefile.am~ 2007-12-06 22:13:15.000000000 +0200
43 +++ mysql-5.0.51/sql/Makefile.am 2007-12-06 22:14:55.492574255 +0200
45 @innodb_system_libs@ \
46 @ndbcluster_libs@ @ndbcluster_system_libs@ \
47 $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
48 - $(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@
49 + $(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@ @LIBCRYPT@
51 noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \
52 item_strfunc.h item_timefunc.h item_uniq.h \