diff options
Diffstat (limited to 'config/ac-macros/yassl.m4')
| -rw-r--r-- | config/ac-macros/yassl.m4 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/config/ac-macros/yassl.m4 b/config/ac-macros/yassl.m4 index dcd72cb14f1..9d9a4d55000 100644 --- a/config/ac-macros/yassl.m4 +++ b/config/ac-macros/yassl.m4 @@ -15,10 +15,9 @@ 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_libs_with_path="\$(top_srcdir)/extra/yassl/src/libyassl.a \$(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.a" + yassl_includes="-I\$(top_srcdir)/extra/yassl/include" AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.]) AC_DEFINE([HAVE_YASSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.]) # System specific checks @@ -36,8 +35,9 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ 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) + AC_SUBST(yassl_libs_with_path) AM_CONDITIONAL([HAVE_YASSL], [ test "with_yassl" = "yes" ]) ]) |