summaryrefslogtreecommitdiff
path: root/server-tools
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2005-10-18 15:43:59 +0200
committerunknown <msvensson@neptunus.(none)>2005-10-18 15:43:59 +0200
commit69585b215b6ca854f9a0757787242df30193946f (patch)
tree710b8c5ba5604cf18f75c3f2e6e10ccc0fcb9003 /server-tools
parentb50eb4cd42d2d5073afb2af5af8b19c825a9cca1 (diff)
downloadmariadb-git-69585b215b6ca854f9a0757787242df30193946f.tar.gz
Bug #12985 Do-mysqlclient-test: Can't find -lyassl when linking
- Use yassl_includes and yassl_libs instead of openssl_includes and openssl_libs to avoid that mysql_config returns that libyassl and libtaocrypt are needed for linking. client/Makefile.am: Add yassl_includes config/ac-macros/yassl.m4: Use own variables for yassl, don't intrude on openssl configure.in: Add yassl_libs to lib_DEPENDENCIES and CLIENT_LIBS libmysql/Makefile.am: Add yassl_includes libmysql_r/Makefile.am: Add yassl_libs and yassl_includes libmysqld/Makefile.am: Add yassl_includes server-tools/instance-manager/Makefile.am: Add yassl includes and lib sql/Makefile.am: Add yassl includes and libe vio/Makefile.am: Add yassl includes and libe
Diffstat (limited to 'server-tools')
-rw-r--r--server-tools/instance-manager/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am
index b872adca09d..4fa2a0da405 100644
--- a/server-tools/instance-manager/Makefile.am
+++ b/server-tools/instance-manager/Makefile.am
@@ -15,7 +15,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
INCLUDES= @ZLIB_INCLUDES@ -I$(top_srcdir)/include \
- $(openssl_includes) -I$(top_builddir)/include
+ @openssl_includes@ @yassl_includes@ -I$(top_builddir)/include
DEFS= -DMYSQL_INSTANCE_MANAGER -DMYSQL_SERVER
@@ -85,7 +85,7 @@ mysqlmanager_LDADD= liboptions.a \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a \
$(top_builddir)/dbug/libdbug.a \
- @openssl_libs@ @ZLIB_LIBS@
+ @openssl_libs@ @yassl_libs@ @ZLIB_LIBS@
tags: