summaryrefslogtreecommitdiff
path: root/libmysql_r
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2005-10-18 15:43:59 +0200
committermsvensson@neptunus.(none) <>2005-10-18 15:43:59 +0200
commit0684dc1342e0e0bbf20224e159fb4b457b598f0c (patch)
tree710b8c5ba5604cf18f75c3f2e6e10ccc0fcb9003 /libmysql_r
parent8369e7de8a18397d4725d2f24d7f3bd40ec71132 (diff)
downloadmariadb-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 'libmysql_r')
-rw-r--r--libmysql_r/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am
index 65255066d45..6ab09368cc5 100644
--- a/libmysql_r/Makefile.am
+++ b/libmysql_r/Makefile.am
@@ -22,10 +22,10 @@
target = libmysqlclient_r.la
target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@
-LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@
+LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@ @yassl_libs@
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
- $(openssl_includes) @ZLIB_INCLUDES@
+ $(openssl_includes) $(yassl_includes) @ZLIB_INCLUDES@
## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include
include $(top_srcdir)/libmysql/Makefile.shared