diff options
| author | unknown <svoj@mysql.com> | 2005-06-15 01:39:58 +0500 |
|---|---|---|
| committer | unknown <svoj@mysql.com> | 2005-06-15 01:39:58 +0500 |
| commit | 70b58ecb9112e3fbcd538ee2cdcb9951a8499a3b (patch) | |
| tree | b849492a438afaedf21cbc9119acd3d888c23832 /tools | |
| parent | d5600efdc1ec98c1b9ef7190565788e7174e45f0 (diff) | |
| download | mariadb-git-70b58ecb9112e3fbcd538ee2cdcb9951a8499a3b.tar.gz | |
WL#2286 - Compile MySQL w/YASSL support
Fix for link failures on boxes with non-gnu compiler.
Fix for compilation failure on hpux11.
extra/yassl/taocrypt/src/misc.cpp:
Adjust __HP_aCC value to solve compilation problem on hpux11.
tools/Makefile.am:
Add a dummy C++ file to mysqltestmanager to make libtool use a C++ linker:
this lets mysqltestmanager link when using yaSSL and a non-gcc C++ compiler.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 036f0b8a76e..651ef2d22b3 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -15,13 +15,18 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Process this file with automake to create Makefile.in +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) \ -I$(top_builddir)/include LDADD= @CLIENT_EXTRA_LDFLAGS@ \ $(top_builddir)/libmysql_r/libmysqlclient_r.la \ @openssl_libs@ @ZLIB_LIBS@ bin_PROGRAMS= mysqltestmanager -mysqltestmanager_SOURCES= mysqlmanager.c +mysqltestmanager_SOURCES= mysqlmanager.c $(yassl_dummy_link_fix) mysqltestmanager_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) DEF= -DUNDEF_THREADS_HACK |