diff options
author | unknown <kent@mysql.com> | 2006-04-01 01:24:28 +0200 |
---|---|---|
committer | unknown <kent@mysql.com> | 2006-04-01 01:24:28 +0200 |
commit | 872d1d71a1d6b6aba2aa0af98cdffb4bb3c01325 (patch) | |
tree | 00ced9c27de60a02e0481185d3be265303992e56 /config | |
parent | fa7e5ed5d7c6f40ddebe88de099f4ba0ee502d47 (diff) | |
download | mariadb-git-872d1d71a1d6b6aba2aa0af98cdffb4bb3c01325.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
config/ac-macros/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
libmysql/Makefile.am:
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
libmysql_r/Makefile.am:
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" ]) |