summaryrefslogtreecommitdiff
path: root/libmysql_r/Makefile.am
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2006-01-09 10:01:07 +0100
committermsvensson@neptunus.(none) <>2006-01-09 10:01:07 +0100
commitdad7268273328b0de7c4fca9623960103e2f8fec (patch)
tree330ea1f743bd500c1b67e6a70299e495f50be50f /libmysql_r/Makefile.am
parentb1214d232ea13c6bcc51d7686b8a51f306be037d (diff)
downloadmariadb-git-dad7268273328b0de7c4fca9623960103e2f8fec.tar.gz
Add yassl libs to libmysqlclient_r as well.
Add a symlink to extra/yassl/include/openssl to inlude/ when compiling with yassl Similiar to readline)
Diffstat (limited to 'libmysql_r/Makefile.am')
-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 ee6dd4cfded..11e65a28a19 100644
--- a/libmysql_r/Makefile.am
+++ b/libmysql_r/Makefile.am
@@ -22,7 +22,7 @@
target = libmysqlclient_r.la
target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@
-LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@ @yassl_libs@
+LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
$(openssl_includes) $(yassl_includes) @ZLIB_INCLUDES@
@@ -32,7 +32,7 @@ include $(top_srcdir)/libmysql/Makefile.shared
libmysql_dir = $(top_srcdir)/libmysql
libmysqlclient_r_la_SOURCES = $(target_sources)
-libmysqlclient_r_la_LIBADD = $(target_libadd)
+libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_libs_with_path)
libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
# This is called from the toplevel makefile