diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-10-28 11:45:30 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-10-28 11:45:30 +0200 |
| commit | 92f698f9f0eeac0d95442248e1581370493201b5 (patch) | |
| tree | 1376a3d4a74cd08e15f83cede09c69c5ec9fec94 /vio | |
| parent | 268eb66421971a5eb4581abe3c51ca4b8f4fd385 (diff) | |
| parent | 2533dd084403235c5f36590a1b8106761ff989b7 (diff) | |
| download | mariadb-git-92f698f9f0eeac0d95442248e1581370493201b5.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
config/ac-macros/yassl.m4:
Auto merged
configure.in:
Auto merged
libmysqld/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
extra/yassl/taocrypt/src/Makefile.am:
Manual merge
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vio/Makefile.am b/vio/Makefile.am index 0d4f052b30a..544639139de 100644 --- a/vio/Makefile.am +++ b/vio/Makefile.am @@ -20,23 +20,23 @@ else yassl_dummy_link_fix= endif INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include \ - $(openssl_includes) -LDADD= @CLIENT_EXTRA_LDFLAGS@ $(openssl_libs) + $(openssl_includes) $(yassl_includes) +LDADD= @CLIENT_EXTRA_LDFLAGS@ $(openssl_libs) $(yassl_libs) pkglib_LIBRARIES= libvio.a noinst_PROGRAMS = test-ssl test-sslserver test-sslclient noinst_HEADERS= vio_priv.h test_ssl_SOURCES= test-ssl.c $(yassl_dummy_link_fix) test_ssl_LDADD= @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a \ ../mysys/libmysys.a ../strings/libmystrings.a \ - $(openssl_libs) + $(openssl_libs) $(yassl_libs) test_sslserver_SOURCES= test-sslserver.c $(yassl_dummy_link_fix) test_sslserver_LDADD= @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a \ ../mysys/libmysys.a ../strings/libmystrings.a \ - $(openssl_libs) + $(openssl_libs) $(yassl_libs) test_sslclient_SOURCES= test-sslclient.c $(yassl_dummy_link_fix) test_sslclient_LDADD= @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a \ ../mysys/libmysys.a ../strings/libmystrings.a \ - $(openssl_libs) + $(openssl_libs) $(yassl_libs) libvio_a_SOURCES= vio.c viosocket.c viossl.c viosslfactories.c # Don't update the files from bitkeeper |