- updated for 4.0.17

Changed files:
    mysql-_r-link.patch -> 1.2
    mysql-libs.patch -> 1.8

diff --git a/mysql-_r-link.patch b/mysql-_r-link.patch
index 21bb8366db6111672cb072cf92c8311c5b775de2..b025cbc02bddcbd118d53160651bda67414e9268 100644 (file)
--- a/mysql-_r-link.patch
+++ b/mysql-_r-link.patch
@@ -4,8 +4,8 @@
  
  target = libmysqlclient_r.la
  target_defs = -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@
--## LIBS = @LIBS@
-+LIBS = @CLIENT_LIBS@
+-LIBS = @LIBS@ @openssl_libs@
++LIBS = @CLIENT_LIBS@ @openssl_libs@
  
  INCLUDES =    @MT_INCLUDES@ -I$(srcdir)/../include -I../include \
                -I$(srcdir)/.. -I$(top_srcdir) -I.. $(openssl_includes)

diff --git a/mysql-libs.patch b/mysql-libs.patch
index 733f455c15ad86b741d54d194d3463a890042334..4acd696feca26cf0fdfea8383c7d09572d072d3c 100644 (file)
--- a/mysql-libs.patch
+++ b/mysql-libs.patch
@@ -1,23 +1,3 @@
---- mysql-4.0.15/acinclude.m4.orig     2003-10-04 13:43:46.567663608 +0200
-+++ mysql-4.0.15/acinclude.m4  2003-10-04 13:44:02.120299248 +0200
-@@ -745,7 +745,7 @@
- 
-       for d in /usr/ssl/lib /usr/local/ssl/lib /usr/lib/openssl \
- /usr/lib /usr/lib64 /opt/ssl/lib /opt/openssl/lib /usr/local/lib/ ; do
--      if test -f $d/libssl.a ; then
-+      if test -f $d/libssl.so -o -f $d/libssl.a ; then
-         OPENSSL_LIB=$d
-       fi
-       done
-@@ -757,7 +757,7 @@
-       if test -f $incs/openssl/ssl.h  ; then
-         OPENSSL_INCLUDE=-I$incs
-       fi
--      if test -f $libs/libssl.a ; then
-+      if test -f $libs/libssl.so -o -f $libs/libssl.a ; then
-         OPENSSL_LIB=$libs
-       fi
-       ;;
 --- mysql-4.0.15/configure.in.orig     2003-10-04 13:29:18.000000000 +0200
 +++ mysql-4.0.15/configure.in  2003-10-04 13:46:50.506700624 +0200
 @@ -746,19 +746,21 @@