Commit e8354a19 authored by unknown's avatar unknown
Browse files

Merge shellback.(none):/home/msvensson/mysql/work/my50-work 

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
parents 50756812 93bbfc8a

config/ac-macros/yassl.m4

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ 
    fi

    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="\$(top_builddir)/extra/yassl/src/libyassl.la \

                \$(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la"

    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.])

    # System specific checks

extra/yassl/taocrypt/benchmark/Makefile.am

+1 −3
Original line number Diff line number Diff line 
INCLUDES = -I../include -I../../mySTL

bin_PROGRAMS       = benchmark

benchmark_SOURCES  = benchmark.cpp

benchmark_LDFLAGS  = -L../src

benchmark_LDADD    = -ltaocrypt

benchmark_LDADD    = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la

benchmark_CXXFLAGS = -DYASSL_PURE_C

benchmark_DEPENDENCIES = ../src/libtaocrypt.la

EXTRA_DIST = benchmark.dsp rsa1024.der dh1024.der dsa1024.der make.bat

extra/yassl/taocrypt/test/Makefile.am

+1 −3
Original line number Diff line number Diff line 
INCLUDES = -I../include -I../../mySTL

bin_PROGRAMS = test

test_SOURCES = test.cpp

test_LDFLAGS  = -L../src

test_LDADD    = -ltaocrypt

test_DEPENDENCIES = ../src/libtaocrypt.la

test_LDADD    = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la

test_CXXFLAGS = -DYASSL_PURE_C

EXTRA_DIST = make.bat

extra/yassl/testsuite/Makefile.am

+2 −3
Original line number Diff line number Diff line
@@ -4,10 +4,9 @@ testsuite_SOURCES = testsuite.cpp ../taocrypt/test/test.cpp \ 
	../examples/client/client.cpp ../examples/server/server.cpp \

	../examples/echoclient/echoclient.cpp \

	../examples/echoserver/echoserver.cpp

testsuite_LDFLAGS  = -L../src/ -L../taocrypt/src

testsuite_CXXFLAGS = -DYASSL_PURE_C -DYASSL_PREFIX -DNO_MAIN_DRIVER

testsuite_LDADD    = -lyassl -ltaocrypt

testsuite_DEPENDENCIES = ../src/libyassl.la ../taocrypt/src/libtaocrypt.la

testsuite_LDADD    = $(top_builddir)/extra/yassl/src/libyassl.la \

                     $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la

EXTRA_DIST = testsuite.dsp test.hpp input quit make.bat



# Don't update the files from bitkeeper