diff options
| author | msvensson@neptunus.(none) <> | 2005-10-18 15:43:59 +0200 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2005-10-18 15:43:59 +0200 |
| commit | 0684dc1342e0e0bbf20224e159fb4b457b598f0c (patch) | |
| tree | 710b8c5ba5604cf18f75c3f2e6e10ccc0fcb9003 /config | |
| parent | 8369e7de8a18397d4725d2f24d7f3bd40ec71132 (diff) | |
| download | mariadb-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 'config')
| -rw-r--r-- | config/ac-macros/yassl.m4 | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/config/ac-macros/yassl.m4 b/config/ac-macros/yassl.m4 index 92133339343..548768fb717 100644 --- a/config/ac-macros/yassl.m4 +++ b/config/ac-macros/yassl.m4 @@ -15,17 +15,15 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ fi AC_MSG_RESULT([using bundled yaSSL]) yassl_dir="extra/yassl" - openssl_libs="\ - -L\$(top_builddir)/extra/yassl/src -lyassl\ - -L\$(top_builddir)/extra/yassl/taocrypt/src -ltaocrypt" - openssl_includes="-I\$(top_srcdir)/extra/yassl/include" + yassl_libs="-L\$(top_srcdir)/extra/yassl/src -lyassl -L\$(top_srcdir)/extra/yassl/taocrypt/src -ltaocrypt" + yassl_includes="-I\$(top_srcdir)/extra/yassl/include" AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.]) else yassl_dir="" AC_MSG_RESULT(no) fi - AC_SUBST(openssl_libs) - AC_SUBST(openssl_includes) + AC_SUBST(yassl_libs) + AC_SUBST(yassl_includes) AC_SUBST(yassl_dir) AM_CONDITIONAL([HAVE_YASSL], [ test "with_yassl" = "yes" ]) ]) |