diff options
| -rw-r--r-- | config/ac-macros/yassl.m4 | 11 | ||||
| -rw-r--r-- | extra/yassl/taocrypt/src/Makefile.am | 7 |
2 files changed, 16 insertions, 2 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) diff --git a/extra/yassl/taocrypt/src/Makefile.am b/extra/yassl/taocrypt/src/Makefile.am index 4549c218d87..c4fc4607622 100644 --- a/extra/yassl/taocrypt/src/Makefile.am +++ b/extra/yassl/taocrypt/src/Makefile.am @@ -1,9 +1,12 @@ INCLUDES = -I../include -I../../mySTL -noinst_LTLIBRARIES = libtaocrypt.la +noinst_LTLIBRARIES = libtaocrypt.la libtaoint.la libtaocrypt_la_SOURCES = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \ - coding.cpp dh.cpp des.cpp dsa.cpp file.cpp hash.cpp integer.cpp \ + coding.cpp dh.cpp des.cpp dsa.cpp file.cpp hash.cpp \ md2.cpp md5.cpp misc.cpp random.cpp ripemd.cpp rsa.cpp sha.cpp \ template_instnt.cpp +libtaocrypt_la_LIBADD = libtaoint.la +libtaoint_la_SOURCES = integer.cpp +libtaoint_la_CXXFLAGS = @yassl_integer_extra_cxxflags@ EXTRA_DIST = ../include/*.hpp AM_CXXFLAGS = -DYASSL_PURE_C |