1 diff -burN mysql-4.0.14.orig/acinclude.m4 mysql-4.0.14/acinclude.m4
2 --- mysql-4.0.14.orig/acinclude.m4 Fri Jul 18 16:57:40 2003
3 +++ mysql-4.0.14/acinclude.m4 Thu Jul 24 23:22:42 2003
5 if test -f $d/libssl.a ; then
8 + if test -f $d/libssl.so ; then
13 # On RedHat 9 we need kerberos to compile openssl
14 diff -burN mysql-4.0.14.orig/configure.in mysql-4.0.14/configure.in
15 --- mysql-4.0.14.orig/configure.in Fri Jul 18 16:57:46 2003
16 +++ mysql-4.0.14/configure.in Thu Jul 24 23:29:00 2003
19 AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity))
21 +AC_CHECK_FUNC(gethostbyname_r, , [
22 AC_CHECK_LIB(nsl_r, gethostbyname_r, [],
23 - AC_CHECK_LIB(nsl, gethostbyname_r))
24 -AC_CHECK_FUNC(gethostbyname_r)
25 + AC_CHECK_LIB(nsl, gethostbyname_r))])
27 AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
28 -AC_CHECK_FUNC(yp_get_default_domain, ,
29 - AC_CHECK_LIB(nsl, yp_get_default_domain))
30 AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open))
31 # This may get things to compile even if bind-8 is installed
32 AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind))
33 # For crypt() on Linux
34 -AC_CHECK_LIB(crypt, crypt)
37 +AC_CHECK_LIB(crypt, crypt, [LIBS="-lcrypt $LIBS"; LIBCRYPT="-lcrypt"])
39 AC_CHECK_FUNC(crypt, AC_DEFINE(HAVE_CRYPT))
42 # For sem_xxx functions on Solaris 2.6
43 AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init))
44 diff -burN mysql-4.0.14.orig/libmysql_r/Makefile.am mysql-4.0.14/libmysql_r/Makefile.am
45 --- mysql-4.0.14.orig/libmysql_r/Makefile.am Fri Jul 18 16:57:47 2003
46 +++ mysql-4.0.14/libmysql_r/Makefile.am Thu Jul 24 23:30:25 2003
48 libmysql_dir = $(top_srcdir)/libmysql
50 libmysqlclient_r_la_SOURCES = $(target_sources)
51 -libmysqlclient_r_la_LIBADD = $(target_libadd)
52 +libmysqlclient_r_la_LIBADD = $(target_libadd) -lpthread
53 libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
55 # This is called from the toplevel makefile
56 diff -burN mysql-4.0.14.orig/sql/Makefile.am mysql-4.0.14/sql/Makefile.am
57 --- mysql-4.0.14.orig/sql/Makefile.am Fri Jul 18 16:57:41 2003
58 +++ mysql-4.0.14/sql/Makefile.am Thu Jul 24 23:29:27 2003
60 mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
61 @bdb_libs@ @innodb_libs@ @pstack_libs@ \
62 @innodb_system_libs@ \
63 - $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@
64 + $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@ @LIBCRYPT@
65 noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \
66 item_strfunc.h item_timefunc.h item_uniq.h \
67 item_create.h mysql_priv.h \
68 diff -burN mysql-4.0.14.orig/vio/Makefile.am mysql-4.0.14/vio/Makefile.am
69 --- mysql-4.0.14.orig/vio/Makefile.am Fri Jul 18 16:57:50 2003
70 +++ mysql-4.0.14/vio/Makefile.am Thu Jul 24 23:24:27 2003
72 test_ssl_SOURCES= test-ssl.c
73 test_ssl_LDADD= @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a \
74 ../mysys/libmysys.a ../strings/libmystrings.a \
76 + $(openssl_libs) ../libmysql_r/libmysqlclient_r.la
77 test_sslserver_SOURCES= test-sslserver.c
78 test_sslserver_LDADD= @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a \
79 ../mysys/libmysys.a ../strings/libmystrings.a \
81 + $(openssl_libs) ../libmysql_r/libmysqlclient_r.la
82 test_sslclient_SOURCES= test-sslclient.c
83 test_sslclient_LDADD= @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a \
84 ../mysys/libmysys.a ../strings/libmystrings.a \
86 + $(openssl_libs) ../libmysql_r/libmysqlclient_r.la
87 libvio_a_SOURCES= vio.c viosocket.c viossl.c viosslfactories.c
89 # Don't update the files from bitkeeper