diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-01-09 10:01:07 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-01-09 10:01:07 +0100 |
| commit | fca6cf46d3423cc01e2463a7c8ffcf56600b5476 (patch) | |
| tree | 330ea1f743bd500c1b67e6a70299e495f50be50f /libmysql_r | |
| parent | 57b203369f72957d7de074019e71d276058c45f2 (diff) | |
| download | mariadb-git-fca6cf46d3423cc01e2463a7c8ffcf56600b5476.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)
config/ac-macros/yassl.m4:
Symlink extra/yassl/include/openssl dir to include/
include/Makefile.am:
Call yassl_h_ln_cmd when linking sources, this will create symlink to openssl in include when compiling with yassl
libmysql_r/Makefile.am:
Inlude yassl libs into libmysqlclient_r(just as we do in libmysqlclient)
Diffstat (limited to 'libmysql_r')
| -rw-r--r-- | libmysql_r/Makefile.am | 4 |
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 |