mysql-libs.patch

   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
   4 @@ -715,6 +715,9 @@
   5    if test -f $d/libssl.a ; then
   6      OPENSSL_LIB=$d
   7    fi
   8 +  if test -f $d/libssl.so ; then
   9 +    OPENSSL_LIB=$d
  10 +  fi
  11   done
  12
  13   if test -z "$OPENSSL_LIB" -o -z "$OPENSSL_INCLUDE" ; then
  14
  15 diff -urN mysql-4.0.10-gamma.org/isam/Makefile.am mysql-4.0.10-gamma/isam/Makefile.am
  16 --- mysql-4.0.10-gamma.org/isam/Makefile.am     Wed Jan 29 12:29:20 2003
  17 +++ mysql-4.0.10-gamma/isam/Makefile.am Wed Feb 12 01:40:37 2003
  18 @@ -16,7 +16,7 @@
  19
  20  INCLUDES =             @MT_INCLUDES@ -I$(srcdir)/../include -I../include
  21  LDADD =                        @CLIENT_EXTRA_LDFLAGS@ libnisam.a ../mysys/libmysys.a \
  22 -                       ../dbug/libdbug.a ../strings/libmystrings.a
  23 +                       ../dbug/libdbug.a ../strings/libmystrings.a /usr/lib/libstdc++.la
  24  pkglib_LIBRARIES =     libnisam.a
  25  bin_PROGRAMS =         isamchk isamlog pack_isam
  26  isamchk_DEPENDENCIES=  $(LIBRARIES)
  27 diff -urN mysql-4.0.10-gamma.org/myisam/Makefile.am mysql-4.0.10-gamma/myisam/Makefile.am
  28 --- mysql-4.0.10-gamma.org/myisam/Makefile.am   Wed Jan 29 12:29:22 2003
  29 +++ mysql-4.0.10-gamma/myisam/Makefile.am       Wed Feb 12 01:40:48 2003
  30 @@ -19,7 +19,7 @@
  31
  32  INCLUDES =             @MT_INCLUDES@ -I$(srcdir)/../include -I../include
  33  LDADD =                        @CLIENT_EXTRA_LDFLAGS@ libmyisam.a ../mysys/libmysys.a \
  34 -                       ../dbug/libdbug.a ../strings/libmystrings.a
  35 +                       ../dbug/libdbug.a ../strings/libmystrings.a /usr/lib/libstdc++.la
  36  pkglib_LIBRARIES =     libmyisam.a
  37  bin_PROGRAMS =         myisamchk myisamlog myisampack
  38  myisamchk_DEPENDENCIES=        $(LIBRARIES)
  39 diff -urN mysql-4.0.10-gamma.org/vio/Makefile.am mysql-4.0.10-gamma/vio/Makefile.am
  40 --- mysql-4.0.10-gamma.org/vio/Makefile.am      Wed Jan 29 12:29:24 2003
  41 +++ mysql-4.0.10-gamma/vio/Makefile.am  Wed Feb 12 01:50:02 2003
  42 @@ -21,13 +21,13 @@
  43  noinst_HEADERS =
  44  test_ssl_SOURCES =   test-ssl.c
  45  test_ssl_LDADD =       @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a ../mysys/libmysys.a \
  46 -                       ../strings/libmystrings.a libvio.a $(openssl_libs)
  47 +                       ../strings/libmystrings.a libvio.a $(openssl_libs) ../libmysql_r/libmysqlclient_r.la
  48  test_sslserver_SOURCES =   test-sslserver.c
  49  test_sslserver_LDADD =   @CLIENT_EXTRA_LDFLAGS@        ../dbug/libdbug.a libvio.a ../mysys/libmysys.a \
  50 -                       ../strings/libmystrings.a libvio.a $(openssl_libs)
  51 +                       ../strings/libmystrings.a libvio.a $(openssl_libs) ../libmysql_r/libmysqlclient_r.la
  52  test_sslclient_SOURCES =   test-sslclient.c
  53  test_sslclient_LDADD =   @CLIENT_EXTRA_LDFLAGS@        ../dbug/libdbug.a libvio.a ../mysys/libmysys.a \
  54 -                       ../strings/libmystrings.a libvio.a $(openssl_libs)
  55 +                       ../strings/libmystrings.a libvio.a $(openssl_libs) ../libmysql_r/libmysqlclient_r.la
  56  libvio_a_SOURCES =     vio.c viosocket.c viossl.c viosslfactories.c
  57
  58  # Don't update the files from bitkeeper