diff options
Diffstat (limited to 'config/ac-macros/yassl.m4')
| -rw-r--r-- | config/ac-macros/yassl.m4 | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/config/ac-macros/yassl.m4 b/config/ac-macros/yassl.m4 index c736f2f10f2..906a65a2fc3 100644 --- a/config/ac-macros/yassl.m4 +++ b/config/ac-macros/yassl.m4 @@ -1,8 +1,3 @@ -AC_CONFIG_FILES(extra/yassl/Makefile dnl -extra/yassl/taocrypt/Makefile dnl -extra/yassl/taocrypt/src/Makefile dnl -extra/yassl/src/Makefile) - AC_DEFUN([MYSQL_CHECK_YASSL], [ AC_MSG_CHECKING(for yaSSL) AC_ARG_WITH([yassl], [ --with-yassl Include the yaSSL support],,) @@ -14,7 +9,11 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ AC_MSG_ERROR([Cannot configure MySQL to use yaSSL and OpenSSL simultaneously.]) fi AC_MSG_RESULT([using bundled yaSSL]) - yassl_dir="extra/yassl" + AC_CONFIG_FILES(extra/yassl/Makefile dnl + extra/yassl/taocrypt/Makefile dnl + extra/yassl/taocrypt/src/Makefile dnl + extra/yassl/src/Makefile) + yassl_dir="yassl" 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.]) |