diff options
| author | unknown <msvensson@devsrv-b.mysql.com> | 2005-11-24 17:17:36 +0100 |
|---|---|---|
| committer | unknown <msvensson@devsrv-b.mysql.com> | 2005-11-24 17:17:36 +0100 |
| commit | a101950d7b2adf1c08de95e581b4d1d5bd84e361 (patch) | |
| tree | fbf6befc3a175c1c3bb107e8d632bc549a63a683 /config | |
| parent | 60f3487405f812d0004242485ed6b00241e726fe (diff) | |
| download | mariadb-git-a101950d7b2adf1c08de95e581b4d1d5bd84e361.tar.gz | |
Bug #15168 yassl failure on amd64
- Use libtool to build libraries
config/ac-macros/yassl.m4:
If necessary, disable inlining for all files in libtaocrypt not only integer.cpp
Remove ver yassl_libs_with_path, not used anymore
extra/yassl/src/Makefile.am:
Let libtool build libraries
extra/yassl/taocrypt/src/Makefile.am:
Let libtool build libraries
Only build one lib
libmysqld/Makefile.am:
Dont include yassl libs in libmysqld
libmysqld/examples/Makefile.am:
Add yassl includes and libs when linking examples with libmysqld
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/yassl.m4 | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/config/ac-macros/yassl.m4 b/config/ac-macros/yassl.m4 index 9d9a4d55000..d1216554862 100644 --- a/config/ac-macros/yassl.m4 +++ b/config/ac-macros/yassl.m4 @@ -16,7 +16,6 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ AC_MSG_RESULT([using bundled yaSSL]) yassl_dir="extra/yassl" yassl_libs="-L\$(top_srcdir)/extra/yassl/src -lyassl -L\$(top_srcdir)/extra/yassl/taocrypt/src -ltaocrypt" - yassl_libs_with_path="\$(top_srcdir)/extra/yassl/src/libyassl.a \$(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.a" yassl_includes="-I\$(top_srcdir)/extra/yassl/include" 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.]) @@ -24,12 +23,12 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ yassl_integer_extra_cxxflags="" case $host_cpu--$CXX_VERSION in sparc*--*Sun*C++*5.6*) - # Disable inlining when compiling taocrypt/src/integer.cpp - yassl_integer_extra_cxxflags="+d" - AC_MSG_NOTICE([disabling inlining for yassl/taocrypt/src/integer.cpp]) + # Disable inlining when compiling taocrypt/src/ + yassl_taocrypt_extra_cxxflags="+d" + AC_MSG_NOTICE([disabling inlining for yassl/taocrypt/src/]) ;; esac - AC_SUBST([yassl_integer_extra_cxxflags]) + AC_SUBST([yassl_taocrypt_extra_cxxflags]) else yassl_dir="" @@ -38,6 +37,5 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ AC_SUBST(yassl_libs) AC_SUBST(yassl_includes) AC_SUBST(yassl_dir) - AC_SUBST(yassl_libs_with_path) AM_CONDITIONAL([HAVE_YASSL], [ test "with_yassl" = "yes" ]) ]) |