-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
-
- if test -z "$OPENSSL_LIB" -o -z "$OPENSSL_INCLUDE" ; then
-
-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
-
- # Don't update the files from bitkeeper
---- mysql-4.0.11a-gamma/configure.in.orig Tue Feb 25 21:29:51 2003
-+++ mysql-4.0.11a-gamma/configure.in Mon Mar 10 22:17:08 2003
-@@ -743,19 +743,21 @@
+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 @@
AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity))
-+AC_CHECK_FUNC(gethostbyname_r, , [
- AC_CHECK_LIB(nsl_r, gethostbyname_r, [],
+-AC_CHECK_LIB(nsl_r, gethostbyname_r, [],
- AC_CHECK_LIB(nsl, gethostbyname_r))
-AC_CHECK_FUNC(gethostbyname_r)
-+ AC_CHECK_LIB(nsl, gethostbyname_r))])
++AC_CHECK_FUNC(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, ,
# For crypt() on Linux
-AC_CHECK_LIB(crypt, crypt)
+save_LIBS="$LIBS"
-+LIBCRYPT=
+AC_CHECK_LIB(crypt, crypt, [LIBS="-lcrypt $LIBS"; LIBCRYPT="-lcrypt"])
+AC_SUBST(LIBCRYPT)
- AC_CHECK_FUNC(crypt, AC_DEFINE(HAVE_CRYPT))
+ AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt]))
+LIBS="$save_LIBS"
# For sem_xxx functions on Solaris 2.6
- AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4))
---- mysql-4.0.11a-gamma/sql/Makefile.am.orig Thu Feb 20 20:57:48 2003
-+++ mysql-4.0.11a-gamma/sql/Makefile.am Mon Mar 10 22:16:32 2003
-@@ -43,7 +43,7 @@
- mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
- @bdb_libs@ @innodb_libs@ @pstack_libs@ \
- @innodb_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 mysql_priv.h \
---- mysql-4.0.11a-gamma/libmysql_r/Makefile.am.orig Mon Mar 10 22:39:27 2003
-+++ mysql-4.0.11a-gamma/libmysql_r/Makefile.am Mon Mar 10 22:45:14 2003
-@@ -30,7 +30,7 @@
+ 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_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