Commit 72aa0f8d authored by unknown's avatar unknown
Browse files

Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15168/my50-bug15168 

into  devsrv-b.mysql.com:/space/magnus/mysql-5.0
parents e69de4f6 a101950d

config/ac-macros/yassl.m4

+4 −6
Original line number Diff line number Diff line
@@ -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" ])

])

extra/yassl/src/Makefile.am

+2 −2
Original line number Diff line number Diff line 
INCLUDES = -I../include -I../taocrypt/include -I../mySTL



noinst_LIBRARIES = libyassl.a

libyassl_a_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \

noinst_LTLIBRARIES = libyassl.la

libyassl_la_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \

	handshake.cpp lock.cpp log.cpp socket_wrapper.cpp ssl.cpp \

	template_instnt.cpp timer.cpp yassl_imp.cpp yassl_error.cpp yassl_int.cpp

EXTRA_DIST = $(wildcard ../include/*.hpp) $(wildcard ../include/openssl/*.h)

extra/yassl/taocrypt/src/Makefile.am

+4 −8
Original line number Diff line number Diff line 
INCLUDES = -I../include -I../../mySTL



noinst_LIBRARIES = libtaoint.a libtaocrypt.a

noinst_LTLIBRARIES = libtaocrypt.la



libtaoint_a_SOURCES = integer.cpp

libtaoint_a_CXXFLAGS = @yassl_integer_extra_cxxflags@



libtaocrypt_a_SOURCES  = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \

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 \

	md2.cpp md5.cpp misc.cpp random.cpp ripemd.cpp rsa.cpp sha.cpp \

	template_instnt.cpp

libtaocrypt_a_LIBADD = libtaoint_a-integer.o

	template_instnt.cpp integer.cpp

libtaocrypt_la_CXXFLAGS = @yassl_taocrypt_extra_cxxflags@ -DYASSL_PURE_C



EXTRA_DIST = $(wildcard ../include/*.hpp)
 
AM_CXXFLAGS = -DYASSL_PURE_C

libmysqld/Makefile.am

+1 −2
Original line number Diff line number Diff line
@@ -80,8 +80,7 @@ INC_LIB= $(top_builddir)/regex/libregex.a \ 
		$(top_builddir)/mysys/libmysys.a \

		$(top_builddir)/strings/libmystrings.a \

		$(top_builddir)/dbug/libdbug.a \

		$(top_builddir)/vio/libvio.a \

                @yassl_libs_with_path@

		$(top_builddir)/vio/libvio.a

		



#

libmysqld/examples/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ link_sources: 
DEFS = 		-DEMBEDDED_LIBRARY

INCLUDES =	-I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir) \

		-I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \

		$(openssl_includes)

LIBS =		@LIBS@ @WRAPLIBS@ @CLIENT_LIBS@

		$(openssl_includes) $(yassl_includes)

LIBS =		@LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs)

LDADD =		@CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS)



mysqltest_embedded_LINK = $(CXXLINK)