projects / packages / mysql.git / blame
| Commit | Line | Data |
|---|---|---|
| 2b48aa2e AM |
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 | ||
| ac674242 AM |
15 | diff -urN mysql-4.0.10-gamma.org/vio/Makefile.am mysql-4.0.10-gamma/vio/Makefile.am |
| 16 | --- mysql-4.0.10-gamma.org/vio/Makefile.am Wed Jan 29 12:29:24 2003 | |
| 17 | +++ mysql-4.0.10-gamma/vio/Makefile.am Wed Feb 12 01:50:02 2003 | |
| 18 | @@ -21,13 +21,13 @@ | |
| 19 | noinst_HEADERS = | |
| 20 | test_ssl_SOURCES = test-ssl.c | |
| 21 | test_ssl_LDADD = @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a ../mysys/libmysys.a \ | |
| 22 | - ../strings/libmystrings.a libvio.a $(openssl_libs) | |
| 23 | + ../strings/libmystrings.a libvio.a $(openssl_libs) ../libmysql_r/libmysqlclient_r.la | |
| 24 | test_sslserver_SOURCES = test-sslserver.c | |
| 25 | test_sslserver_LDADD = @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a ../mysys/libmysys.a \ | |
| 26 | - ../strings/libmystrings.a libvio.a $(openssl_libs) | |
| 27 | + ../strings/libmystrings.a libvio.a $(openssl_libs) ../libmysql_r/libmysqlclient_r.la | |
| 28 | test_sslclient_SOURCES = test-sslclient.c | |
| 29 | test_sslclient_LDADD = @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a ../mysys/libmysys.a \ | |
| 30 | - ../strings/libmystrings.a libvio.a $(openssl_libs) | |
| 31 | + ../strings/libmystrings.a libvio.a $(openssl_libs) ../libmysql_r/libmysqlclient_r.la | |
| 32 | libvio_a_SOURCES = vio.c viosocket.c viossl.c viosslfactories.c | |
| 33 | ||
| 34 | # Don't update the files from bitkeeper |