mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
This commit is contained in:
msvensson@shellback.(none) 2006-09-21 12:25:35 +02:00
commit 08cdf195ce
4 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config/ac-macros/yassl.m4
View file

@ -18,7 +18,8 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [
fi fi
AC_MSG_RESULT([using bundled yaSSL]) AC_MSG_RESULT([using bundled yaSSL])
yassl_dir="extra/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_OPENSSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.])
AC_DEFINE([HAVE_YASSL], [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 # System specific checks

4
extra/yassl/taocrypt/benchmark/Makefile.am
View file

@ -1,8 +1,6 @@
INCLUDES = -I../include -I../../mySTL INCLUDES = -I../include -I../../mySTL
bin_PROGRAMS = benchmark bin_PROGRAMS = benchmark
benchmark_SOURCES = benchmark.cpp benchmark_SOURCES = benchmark.cpp
benchmark_LDFLAGS = -L../src benchmark_LDADD = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
benchmark_LDADD = -ltaocrypt
benchmark_CXXFLAGS = -DYASSL_PURE_C benchmark_CXXFLAGS = -DYASSL_PURE_C
benchmark_DEPENDENCIES = ../src/libtaocrypt.la
EXTRA_DIST = benchmark.dsp rsa1024.der dh1024.der dsa1024.der make.bat EXTRA_DIST = benchmark.dsp rsa1024.der dh1024.der dsa1024.der make.bat

4
extra/yassl/taocrypt/test/Makefile.am
View file

@ -1,8 +1,6 @@
INCLUDES = -I../include -I../../mySTL INCLUDES = -I../include -I../../mySTL
bin_PROGRAMS = test bin_PROGRAMS = test
test_SOURCES = test.cpp test_SOURCES = test.cpp
test_LDFLAGS = -L../src test_LDADD = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
test_LDADD = -ltaocrypt
test_DEPENDENCIES = ../src/libtaocrypt.la
test_CXXFLAGS = -DYASSL_PURE_C test_CXXFLAGS = -DYASSL_PURE_C
EXTRA_DIST = make.bat EXTRA_DIST = make.bat

5
extra/yassl/testsuite/Makefile.am
View file

@ -4,10 +4,9 @@ testsuite_SOURCES = testsuite.cpp ../taocrypt/test/test.cpp \
../examples/client/client.cpp ../examples/server/server.cpp \ ../examples/client/client.cpp ../examples/server/server.cpp \
../examples/echoclient/echoclient.cpp \ ../examples/echoclient/echoclient.cpp \
../examples/echoserver/echoserver.cpp ../examples/echoserver/echoserver.cpp
testsuite_LDFLAGS = -L../src/ -L../taocrypt/src
testsuite_CXXFLAGS = -DYASSL_PURE_C -DYASSL_PREFIX -DNO_MAIN_DRIVER testsuite_CXXFLAGS = -DYASSL_PURE_C -DYASSL_PREFIX -DNO_MAIN_DRIVER
testsuite_LDADD = -lyassl -ltaocrypt testsuite_LDADD = $(top_builddir)/extra/yassl/src/libyassl.la \
testsuite_DEPENDENCIES = ../src/libyassl.la ../taocrypt/src/libtaocrypt.la $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
EXTRA_DIST = testsuite.dsp test.hpp input quit make.bat EXTRA_DIST = testsuite.dsp test.hpp input quit make.bat
# Don't update the files from bitkeeper # Don't update the files from bitkeeper