diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-01-04 16:34:03 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-01-04 16:34:03 +0100 |
| commit | de307de5cf1287a09ca27336ce2bad20e23fa12f (patch) | |
| tree | 584a2632ee8f48c31991d9ec12939e405e9ddb5f /config | |
| parent | 1fa7eb82bf35e710449ea2058ef364c1facf7dd1 (diff) | |
| parent | 6f2eb6e00d73b064d1cd986dac56713dc35cbd87 (diff) | |
| download | mariadb-git-de307de5cf1287a09ca27336ce2bad20e23fa12f.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my50-yassl_link_problem
into neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my51-yassl_link_problem
include/Makefile.am:
Auto merged
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) |