diff options
| author | unknown <svoj@mysql.com> | 2005-06-12 18:18:46 +0500 |
|---|---|---|
| committer | unknown <svoj@mysql.com> | 2005-06-12 18:18:46 +0500 |
| commit | c0f99623e70a6f4a2c5c80ba00d31ba517529f6b (patch) | |
| tree | b85af950dec5e1657f0299eb81122f1953146d41 /vio | |
| parent | 77a98e8b23c67339fc428fd08146b0d040338f7d (diff) | |
| download | mariadb-git-c0f99623e70a6f4a2c5c80ba00d31ba517529f6b.tar.gz | |
WL#2286 - Compile MySQL w/YASSL support
Fix for link failures on boxes with non-gnu compiler.
client/Makefile.am:
Add a dummy C++ file to client suite to make libtool use a C++ linker:
this lets client suite link when using yaSSL and a non-gcc C++ compiler.
config/ac-macros/yassl.m4:
HAVE_YASSL conditional is used to add dummy C++ file if configured with yaSSL.
tests/Makefile.am:
Add a dummy C++ file to tests to make libtool use a C++ linker:
this lets tests link when using yaSSL and a non-gcc C++ compiler.
vio/Makefile.am:
Use dummy C++ file if configured with yaSSL only.
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/Makefile.am | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/vio/Makefile.am b/vio/Makefile.am index 22e706efe4c..cd4212089c4 100644 --- a/vio/Makefile.am +++ b/vio/Makefile.am @@ -14,22 +14,25 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +if HAVE_YASSL + yassl_dummy_link_fix= $(top_srcdir)/extra/yassl/src/dummy.cpp +else + yassl_dummy_link_fix= +endif INCLUDES= -I$(top_srcdir)/include $(openssl_includes) LDADD= @CLIENT_EXTRA_LDFLAGS@ $(openssl_libs) pkglib_LIBRARIES= libvio.a noinst_PROGRAMS = test-ssl test-sslserver test-sslclient noinst_HEADERS= vio_priv.h -test_ssl_SOURCES= test-ssl.c $(top_srcdir)/extra/yassl/src/dummy.cpp +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) -test_sslserver_SOURCES= test-sslserver.c \ - $(top_srcdir)/extra/yassl/src/dummy.cpp +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) -test_sslclient_SOURCES= test-sslclient.c \ - $(top_srcdir)/extra/yassl/src/dummy.cpp +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) |