diff options
| author | unknown <kent@mysql.com/kent-amd64.(none)> | 2006-11-29 18:36:51 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com/kent-amd64.(none)> | 2006-11-29 18:36:51 +0100 |
| commit | 8f71610f9cd13fafdfd764da5554532b2624e215 (patch) | |
| tree | 2d97362e7321b75f941b9774d0baff880c714df7 /config | |
| parent | d6eb3627555bd3d782514a5983173bb1201c0ec6 (diff) | |
| download | mariadb-git-8f71610f9cd13fafdfd764da5554532b2624e215.tar.gz | |
Many files:
Changed paths to ndb include directory to include "storage"
Makefile.am:
Adjusted path to yaSSL libtool libraries
ssl.m4:
Use libtool way of specifying yaSSL libraries
config/ac-macros/ssl.m4:
Use libtool way of specifying yaSSL libraries
libmysqld/Makefile.am:
Adjusted path to yaSSL libtool libraries
storage/ndb/config/type_kernel.mk.am:
Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapi.mk.am:
Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapitest.mk.am:
Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapitools.mk.am:
Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_util.mk.am:
Changed paths to ndb include directory to include "storage"
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/ssl.m4 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/config/ac-macros/ssl.m4 b/config/ac-macros/ssl.m4 index 0f2f207c36f..4ee58318a62 100644 --- a/config/ac-macros/ssl.m4 +++ b/config/ac-macros/ssl.m4 @@ -28,10 +28,9 @@ AC_DEFUN([MYSQL_USE_BUNDLED_YASSL], [ yassl_dir="yassl" AC_SUBST([yassl_dir]) - yassl_libs="-L\$(top_srcdir)/extra/yassl/src -lyassl -L\$(top_srcdir)/extra/yassl/taocrypt/src -ltaocrypt" + yassl_libs="\$(top_builddir)/extra/yassl/src/libyassl.la \ + \$(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la" AC_SUBST(yassl_libs) - yassl_includes="-I\$(top_srcdir)/extra/yassl/include" - AC_SUBST(yassl_includes) AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for SSL.]) AC_DEFINE([HAVE_YASSL], [1], [Defined by configure. Using yaSSL for SSL.]) |