-diff -urN mysql-4.0.9-gamma.org/acinclude.m4 mysql-4.0.9-gamma/acinclude.m4
---- mysql-4.0.9-gamma.org/acinclude.m4 Mon Feb 3 23:34:15 2003
-+++ mysql-4.0.9-gamma/acinclude.m4 Tue Feb 4 00:11:55 2003
-@@ -715,6 +715,9 @@
- if test -f $d/libssl.a ; then
- OPENSSL_LIB=$d
- fi
-+ if test -f $d/libssl.so ; then
-+ OPENSSL_LIB=$d
-+ fi
- done
+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 @@
- if test -z "$OPENSSL_LIB" -o -z "$OPENSSL_INCLUDE" ; then
-
-diff -urN mysql-4.0.10-gamma.org/isam/Makefile.am mysql-4.0.10-gamma/isam/Makefile.am
---- mysql-4.0.10-gamma.org/isam/Makefile.am Wed Jan 29 12:29:20 2003
-+++ mysql-4.0.10-gamma/isam/Makefile.am Wed Feb 12 01:40:37 2003
-@@ -16,7 +16,7 @@
+ AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity))
- INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include
- LDADD = @CLIENT_EXTRA_LDFLAGS@ libnisam.a ../mysys/libmysys.a \
-- ../dbug/libdbug.a ../strings/libmystrings.a
-+ ../dbug/libdbug.a ../strings/libmystrings.a /usr/lib/libstdc++.la
- pkglib_LIBRARIES = libnisam.a
- bin_PROGRAMS = isamchk isamlog pack_isam
- isamchk_DEPENDENCIES= $(LIBRARIES)
-diff -urN mysql-4.0.10-gamma.org/myisam/Makefile.am mysql-4.0.10-gamma/myisam/Makefile.am
---- mysql-4.0.10-gamma.org/myisam/Makefile.am Wed Jan 29 12:29:22 2003
-+++ mysql-4.0.10-gamma/myisam/Makefile.am Wed Feb 12 01:40:48 2003
-@@ -19,7 +19,7 @@
+-AC_CHECK_LIB(nsl_r, gethostbyname_r, [],
+- 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)])])
- INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include
- LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a ../mysys/libmysys.a \
-- ../dbug/libdbug.a ../strings/libmystrings.a
-+ ../dbug/libdbug.a ../strings/libmystrings.a /usr/lib/libstdc++.la
- pkglib_LIBRARIES = libmyisam.a
- bin_PROGRAMS = myisamchk myisamlog myisampack
- myisamchk_DEPENDENCIES= $(LIBRARIES)
-diff -urN mysql-4.0.10-gamma.org/vio/Makefile.am mysql-4.0.10-gamma/vio/Makefile.am
---- mysql-4.0.10-gamma.org/vio/Makefile.am Wed Jan 29 12:29:24 2003
-+++ mysql-4.0.10-gamma/vio/Makefile.am Wed Feb 12 01:50:02 2003
-@@ -21,13 +21,13 @@
- noinst_HEADERS =
- test_ssl_SOURCES = test-ssl.c
- test_ssl_LDADD = @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a ../mysys/libmysys.a \
-- ../strings/libmystrings.a libvio.a $(openssl_libs)
-+ ../strings/libmystrings.a libvio.a $(openssl_libs) ../libmysql_r/libmysqlclient_r.la
- test_sslserver_SOURCES = test-sslserver.c
- test_sslserver_LDADD = @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a ../mysys/libmysys.a \
-- ../strings/libmystrings.a libvio.a $(openssl_libs)
-+ ../strings/libmystrings.a libvio.a $(openssl_libs) ../libmysql_r/libmysqlclient_r.la
- test_sslclient_SOURCES = test-sslclient.c
- test_sslclient_LDADD = @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a ../mysys/libmysys.a \
-- ../strings/libmystrings.a libvio.a $(openssl_libs)
-+ ../strings/libmystrings.a libvio.a $(openssl_libs) ../libmysql_r/libmysqlclient_r.la
- libvio_a_SOURCES = vio.c viosocket.c viossl.c viosslfactories.c
+ 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))
+ # 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)
++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]))
++LIBS="$save_LIBS"
- # Don't update the files from bitkeeper
+ # 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
+@@ -43,7 +43,7 @@
+ @bdb_libs@ @innodb_libs@ @pstack_libs@ \
+ @innodb_system_libs@ \
+ @ndbcluster_libs@ @ndbcluster_system_libs@ \
+- $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@
++ $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_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 \
projects / packages / mysql.git / blobdiff