diff options
| author | unknown <jimw@mysql.com> | 2006-05-01 00:14:32 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2006-05-01 00:14:32 -0700 |
| commit | a6c8de9163dad414ac2749e0fed7b776b7137212 (patch) | |
| tree | 8ef0c2d5e3dd04138fa175b2c147a5ae891ba2d1 /config/ac-macros/yassl.m4 | |
| parent | c3c5f8d6d73ff71e9b49d8ce0bf4fa4be865b1da (diff) | |
| download | mariadb-git-a6c8de9163dad414ac2749e0fed7b776b7137212.tar.gz | |
Clean up after big merge
config/ac-macros/yassl.m4:
Fix like of yassl makefiles after merge
mysql-test/lib/mtr_process.pl:
Re-add line accidently cut out during merge
mysql-test/mysql-test-run.pl:
Don't start up ndbcluster slave if we don't need it, and fix how
NDB_STATUS_OK is defined
mysql-test/r/rpl_openssl.result:
Update results
sql/mysqld.cc:
Remove duplicate of have_dlopen (bad merge)
sql/set_var.cc:
Remove duplicate of prepared_stmt_count (bad merge)
Diffstat (limited to 'config/ac-macros/yassl.m4')
| -rw-r--r-- | config/ac-macros/yassl.m4 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config/ac-macros/yassl.m4 b/config/ac-macros/yassl.m4 index 906a65a2fc3..f6eee32ff84 100644 --- a/config/ac-macros/yassl.m4 +++ b/config/ac-macros/yassl.m4 @@ -11,8 +11,11 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ AC_MSG_RESULT([using bundled yaSSL]) AC_CONFIG_FILES(extra/yassl/Makefile dnl extra/yassl/taocrypt/Makefile dnl + extra/yassl/taocrypt/benchmark/Makefile dnl extra/yassl/taocrypt/src/Makefile dnl - extra/yassl/src/Makefile) + extra/yassl/taocrypt/test/Makefile dnl + extra/yassl/src/Makefile dnl + extra/yassl/testsuite/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" |