1 diff -urN mysql-4.0.9-gamma.org/acinclude.m4 mysql-4.0.9-gamma/acinclude.m4
2 --- mysql-4.0.9-gamma.org/acinclude.m4 Mon Feb 3 23:34:15 2003
3 +++ mysql-4.0.9-gamma/acinclude.m4 Tue Feb 4 00:11:55 2003
5 if test -f $d/libssl.a ; then
8 + if test -f $d/libssl.so ; then
13 if test -z "$OPENSSL_LIB" -o -z "$OPENSSL_INCLUDE" ; then
15 diff -urN mysql-4.0.10-gamma.org/vio/Makefile.am mysql-4.0.10-gamma/vio/Makefile.am
16 --- mysql-4.0.10-gamma.org/vio/Makefile.am Wed Jan 29 12:29:24 2003
17 +++ mysql-4.0.10-gamma/vio/Makefile.am Wed Feb 12 01:50:02 2003
20 test_ssl_SOURCES = test-ssl.c
21 test_ssl_LDADD = @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a ../mysys/libmysys.a \
22 - ../strings/libmystrings.a libvio.a $(openssl_libs)
23 + ../strings/libmystrings.a libvio.a $(openssl_libs) ../libmysql_r/libmysqlclient_r.la
24 test_sslserver_SOURCES = test-sslserver.c
25 test_sslserver_LDADD = @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a ../mysys/libmysys.a \
26 - ../strings/libmystrings.a libvio.a $(openssl_libs)
27 + ../strings/libmystrings.a libvio.a $(openssl_libs) ../libmysql_r/libmysqlclient_r.la
28 test_sslclient_SOURCES = test-sslclient.c
29 test_sslclient_LDADD = @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a ../mysys/libmysys.a \
30 - ../strings/libmystrings.a libvio.a $(openssl_libs)
31 + ../strings/libmystrings.a libvio.a $(openssl_libs) ../libmysql_r/libmysqlclient_r.la
32 libvio_a_SOURCES = vio.c viosocket.c viossl.c viosslfactories.c
34 # Don't update the files from bitkeeper
35 --- mysql-4.0.11a-gamma/configure.in.orig Tue Feb 25 21:29:51 2003
36 +++ mysql-4.0.11a-gamma/configure.in Mon Mar 10 22:17:08 2003
39 AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity))
41 +AC_CHECK_FUNC(gethostbyname_r, , [
42 AC_CHECK_LIB(nsl_r, gethostbyname_r, [],
43 - AC_CHECK_LIB(nsl, gethostbyname_r))
44 -AC_CHECK_FUNC(gethostbyname_r)
45 + AC_CHECK_LIB(nsl, gethostbyname_r))])
47 AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
48 -AC_CHECK_FUNC(yp_get_default_domain, ,
49 - AC_CHECK_LIB(nsl, yp_get_default_domain))
50 AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open))
51 # This may get things to compile even if bind-8 is installed
52 AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind))
53 # For crypt() on Linux
54 -AC_CHECK_LIB(crypt, crypt)
57 +AC_CHECK_LIB(crypt, crypt, [LIBS="-lcrypt $LIBS"; LIBCRYPT="-lcrypt"])
59 AC_CHECK_FUNC(crypt, AC_DEFINE(HAVE_CRYPT))
62 # For sem_xxx functions on Solaris 2.6
63 AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4))
64 --- mysql-4.0.11a-gamma/sql/Makefile.am.orig Thu Feb 20 20:57:48 2003
65 +++ mysql-4.0.11a-gamma/sql/Makefile.am Mon Mar 10 22:16:32 2003
67 mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
68 @bdb_libs@ @innodb_libs@ @pstack_libs@ \
69 @innodb_system_libs@ \
70 - $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@
71 + $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@ @LIBCRYPT@
72 noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \
73 item_strfunc.h item_timefunc.h item_uniq.h \
74 item_create.h mysql_priv.h \
75 --- mysql-4.0.11a-gamma/libmysql_r/Makefile.am.orig Mon Mar 10 22:39:27 2003
76 +++ mysql-4.0.11a-gamma/libmysql_r/Makefile.am Mon Mar 10 22:45:14 2003
78 libmysql_dir = $(top_srcdir)/libmysql
80 libmysqlclient_r_la_SOURCES = $(target_sources)
81 -libmysqlclient_r_la_LIBADD = $(target_libadd)
82 +libmysqlclient_r_la_LIBADD = $(target_libadd) -lpthread
83 libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
85 # This is called from the toplevel makefile