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 /config | |
| 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 'config')
| -rw-r--r-- | config/ac-macros/yassl.m4 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/ac-macros/yassl.m4 b/config/ac-macros/yassl.m4 index 77208faee0c..b4160ad2a99 100644 --- a/config/ac-macros/yassl.m4 +++ b/config/ac-macros/yassl.m4 @@ -30,7 +30,9 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ ;; esac AC_SUBST([yassl_taocrypt_extra_cxxflags]) - + # Link extra/yassl/include/openssl subdir to include/ + yassl_h_ln_cmd="\$(LN) -s \$(top_srcdir)/extra/yassl/include/openssl openssl" + AC_SUBST(yassl_h_ln_cmd) else yassl_dir="" AC_MSG_RESULT(no) |