diff options
| author | kent@mysql.com <> | 2006-04-01 01:24:28 +0200 |
|---|---|---|
| committer | kent@mysql.com <> | 2006-04-01 01:24:28 +0200 |
| commit | f5a9cc17a14abaf70b8888c9ddbf68862c4eaf49 (patch) | |
| tree | 00ced9c27de60a02e0481185d3be265303992e56 /config | |
| parent | 50b08681412a45af9a9895e7d2cdbce67bd27bb2 (diff) | |
| download | mariadb-git-f5a9cc17a14abaf70b8888c9ddbf68862c4eaf49.tar.gz | |
Makefile.am, yassl.m4:
Enable automake to determine dependency on yaSSL, by explicitly
listing the .la files in Makefile.am, instead of using
'yassl_libs_with_path', bug#18273
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/yassl.m4 | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config/ac-macros/yassl.m4 b/config/ac-macros/yassl.m4 index b4160ad2a99..0de93670663 100644 --- a/config/ac-macros/yassl.m4 +++ b/config/ac-macros/yassl.m4 @@ -17,7 +17,6 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ yassl_dir="extra/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" - yassl_libs_with_path="\$(top_srcdir)/extra/yassl/src/libyassl.la \$(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.la" 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 @@ -38,7 +37,6 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ AC_MSG_RESULT(no) fi AC_SUBST(yassl_libs) - AC_SUBST(yassl_libs_with_path) AC_SUBST(yassl_includes) AC_SUBST(yassl_dir) AM_CONDITIONAL([HAVE_YASSL], [ test "with_yassl" = "yes" ]) |