1 --- mysql-4.1.19/configure.in~ 2006-05-04 22:37:01.424363499 +0300
2 +++ mysql-4.1.19/configure.in 2006-05-04 22:39:56.658291086 +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]))
28 # For sem_xxx functions on Solaris 2.6
29 AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init))
30 --- mysql-4.1.7.org/libmysql_r/Makefile.am 2004-10-27 01:35:55.265121136 +0200
31 +++ mysql-4.1.7/libmysql_r/Makefile.am 2004-10-27 01:36:23.574817408 +0200
33 libmysql_dir = $(top_srcdir)/libmysql
35 libmysqlclient_r_la_SOURCES = $(target_sources)
36 -libmysqlclient_r_la_LIBADD = $(target_libadd)
37 +libmysqlclient_r_la_LIBADD = $(target_libadd) -lpthread
38 libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
40 # This is called from the toplevel makefile
41 --- mysql-4.1.7.org/sql/Makefile.am 2004-10-27 01:35:55.971013824 +0200
42 +++ mysql-4.1.7/sql/Makefile.am 2004-10-27 01:37:07.260176224 +0200
44 @bdb_libs@ @innodb_libs@ @pstack_libs@ \
45 @innodb_system_libs@ \
46 @ndbcluster_libs@ @ndbcluster_system_libs@ \
47 - $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@ \
48 + $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@ @LIBCRYPT@ \
50 noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \
51 item_strfunc.h item_timefunc.h item_uniq.h \