diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-09-15 09:09:10 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-09-15 09:09:10 +0200 |
| commit | 91611dae22c1bdc0243a423e5ad60d07445f7968 (patch) | |
| tree | 9fdb4cc6dbe42392295fef588a2e5eec088b62f8 /config | |
| parent | b763c011b04b7a33113b91091ac65c9f8c77a011 (diff) | |
| parent | 21e1efc75582e3f999e869190c625f409fe1c125 (diff) | |
| download | mariadb-git-91611dae22c1bdc0243a423e5ad60d07445f7968.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526
into neptunus.(none):/home/msvensson/mysql/bug12526/my51-bug12526
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/yassl.m4 | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/config/ac-macros/yassl.m4 b/config/ac-macros/yassl.m4 index 92133339343..7af39db48be 100644 --- a/config/ac-macros/yassl.m4 +++ b/config/ac-macros/yassl.m4 @@ -20,6 +20,17 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ -L\$(top_builddir)/extra/yassl/taocrypt/src -ltaocrypt" openssl_includes="-I\$(top_srcdir)/extra/yassl/include" AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.]) + + # System specific checks + yassl_integer_extra_cxxflags="" + case $SYSTEM_TYPE--$CXX_VERSION in + sparc*solaris*--*Sun*C++*5.6*) + # Disable inlining when compiling taocrypt/src/integer.cpp + yassl_integer_extra_cxxflags="+d" + ;; + esac + AC_SUBST([yassl_integer_extra_cxxflags]) + else yassl_dir="" AC_MSG_RESULT(no) |