-diff -urN mysql-4.1.7.org/configure.in mysql-4.1.7/configure.in
---- mysql-4.1.7.org/configure.in 2004-10-27 01:35:54.930172056 +0200
-+++ mysql-4.1.7/configure.in 2004-10-27 01:39:04.368373072 +0200
-@@ -779,19 +779,20 @@
+--- mysql-5.0.56/configure.in~ 2008-04-07 09:44:34.000000000 +0300
++++ mysql-5.0.56/configure.in 2008-04-07 12:23:29.657592515 +0300
+@@ -826,9 +826,9 @@
AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity))
- AC_CHECK_LIB(nsl, gethostbyname_r))
-AC_CHECK_FUNC(gethostbyname_r)
+AC_CHECK_FUNC(gethostbyname_r, [],
-+ [AC_CHECK_LIB(nsl_r, gethostbyname_r, [],
-+ [AC_CHECK_LIB(nsl, gethostbyname_r)])])
++ [AC_CHECK_LIB(nsl_r, gethostbyname_r, [],
++ [AC_CHECK_LIB(nsl, gethostbyname_r)])])
AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
--AC_CHECK_FUNC(yp_get_default_domain, ,
-- AC_CHECK_LIB(nsl, yp_get_default_domain))
- AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open))
+ AC_CHECK_FUNC(yp_get_default_domain, ,
+@@ -837,7 +837,11 @@
# This may get things to compile even if bind-8 is installed
AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind))
- # For crypt() on Linux
--AC_CHECK_LIB(crypt, crypt)
+ # Check if crypt() exists in libc or libcrypt, sets LIBS if needed
+-AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt]))
+save_LIBS="$LIBS"
+AC_CHECK_LIB(crypt, crypt, [LIBS="-lcrypt $LIBS"; LIBCRYPT="-lcrypt"])
+AC_SUBST(LIBCRYPT)
- AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt]))
++AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt]))
+LIBS="$save_LIBS"
+ # See if we need a library for address lookup.
+ AC_SEARCH_LIBS(inet_aton, [socket nsl resolv])
- # For sem_xxx functions on Solaris 2.6
- AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init))
-diff -urN mysql-4.1.7.org/libmysql_r/Makefile.am mysql-4.1.7/libmysql_r/Makefile.am
---- mysql-4.1.7.org/libmysql_r/Makefile.am 2004-10-27 01:35:55.265121136 +0200
-+++ mysql-4.1.7/libmysql_r/Makefile.am 2004-10-27 01:36:23.574817408 +0200
-@@ -33,7 +33,7 @@
- libmysql_dir = $(top_srcdir)/libmysql
-
- libmysqlclient_r_la_SOURCES = $(target_sources)
--libmysqlclient_r_la_LIBADD = $(target_libadd)
-+libmysqlclient_r_la_LIBADD = $(target_libadd) -lpthread
- libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
-
- # This is called from the toplevel makefile
-diff -urN mysql-4.1.7.org/sql/Makefile.am mysql-4.1.7/sql/Makefile.am
---- mysql-4.1.7.org/sql/Makefile.am 2004-10-27 01:35:55.971013824 +0200
-+++ mysql-4.1.7/sql/Makefile.am 2004-10-27 01:37:07.260176224 +0200
-@@ -44,7 +44,7 @@
+--- mysql-5.0.51/sql/Makefile.am~ 2007-12-06 22:13:15.000000000 +0200
++++ mysql-5.0.51/sql/Makefile.am 2007-12-06 22:14:55.492574255 +0200
+@@ -43,7 +43,7 @@
@innodb_system_libs@ \
@ndbcluster_libs@ @ndbcluster_system_libs@ \
$(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
-- @yassl_libs@ @openssl_libs@
-+ @yassl_libs@ @openssl_libs@ @LIBCRYPT@
+- $(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@
++ $(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@ @LIBCRYPT@
+
noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \
item_strfunc.h item_timefunc.h item_uniq.h \
- item_create.h item_subselect.h item_row.h \