summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorunknown <svoj@mysql.com>2005-05-20 01:44:05 +0500
committerunknown <svoj@mysql.com>2005-05-20 01:44:05 +0500
commit4679c7a8fe36819df60ecf769351e10efa911548 (patch)
tree770cdc4d2e51e24961a9a65462ebcfce7bb2f858 /tools
parent9c1bc4252f925a6cf43433492a49f3107ec1b67a (diff)
downloadmariadb-git-4679c7a8fe36819df60ecf769351e10efa911548.tar.gz
WL#2286 - Compile MySQL w/YASSL support
compilation fixes extra/yassl/src/cert_wrapper.cpp: yaSSL compilation fix on nocona extra/yassl/taocrypt/include/error.hpp: yaSSL compilation fix extra/yassl/taocrypt/include/misc.hpp: yaSSL compilation fix on many platforms tools/Makefile.am: mysqltestmanager with yaSSL enabled compilation fix on FreeBSD 5.3
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 3b84aafeaa9..036f0b8a76e 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -17,8 +17,9 @@
INCLUDES=-I$(top_srcdir)/include $(openssl_includes) \
-I$(top_builddir)/include
-LDADD= @CLIENT_EXTRA_LDFLAGS@ @openssl_libs@ \
- $(top_builddir)/libmysql_r/libmysqlclient_r.la @ZLIB_LIBS@
+LDADD= @CLIENT_EXTRA_LDFLAGS@ \
+ $(top_builddir)/libmysql_r/libmysqlclient_r.la \
+ @openssl_libs@ @ZLIB_LIBS@
bin_PROGRAMS= mysqltestmanager
mysqltestmanager_SOURCES= mysqlmanager.c
mysqltestmanager_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)