1 --- mysql-4.0.15/configure.in.orig 2003-10-04 13:29:18.000000000 +0200
2 +++ mysql-4.0.15/configure.in 2003-10-04 13:46:50.506700624 +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 # For crypt() on Linux
21 -AC_CHECK_LIB(crypt, crypt)
24 +AC_CHECK_LIB(crypt, crypt, [LIBS="-lcrypt $LIBS"; LIBCRYPT="-lcrypt"])
26 AC_CHECK_FUNC(crypt, AC_DEFINE(HAVE_CRYPT))
29 # For sem_xxx functions on Solaris 2.6
30 AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init))
31 --- mysql-4.0.15/libmysql_r/Makefile.am.orig 2003-10-04 13:29:16.000000000 +0200
32 +++ mysql-4.0.15/libmysql_r/Makefile.am 2003-10-04 13:47:15.957831464 +0200
34 libmysql_dir = $(top_srcdir)/libmysql
36 libmysqlclient_r_la_SOURCES = $(target_sources)
37 -libmysqlclient_r_la_LIBADD = $(target_libadd)
38 +libmysqlclient_r_la_LIBADD = $(target_libadd) -lpthread
39 libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
41 # This is called from the toplevel makefile
42 --- mysql-4.0.15/sql/Makefile.am.orig 2003-09-06 08:35:50.000000000 +0200
43 +++ mysql-4.0.15/sql/Makefile.am 2003-10-04 13:47:34.660988152 +0200
45 mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
46 @bdb_libs@ @innodb_libs@ @pstack_libs@ \
47 @innodb_system_libs@ \
48 - $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@
49 + $(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 \
52 item_create.h mysql_priv.h \