diff options
| author | msvensson@neptunus.(none) <> | 2005-10-18 15:43:59 +0200 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2005-10-18 15:43:59 +0200 |
| commit | 0684dc1342e0e0bbf20224e159fb4b457b598f0c (patch) | |
| tree | 710b8c5ba5604cf18f75c3f2e6e10ccc0fcb9003 /server-tools | |
| parent | 8369e7de8a18397d4725d2f24d7f3bd40ec71132 (diff) | |
| download | mariadb-git-0684dc1342e0e0bbf20224e159fb4b457b598f0c.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.
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/Makefile.am | 4 |
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: |