Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
08cdf195
Commit
08cdf195
authored
Sep 21, 2006
by
msvensson@shellback.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
parents
c74ebcc1
346730ee
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
10 deletions
+6
-10
config/ac-macros/yassl.m4
config/ac-macros/yassl.m4
+2
-1
extra/yassl/taocrypt/benchmark/Makefile.am
extra/yassl/taocrypt/benchmark/Makefile.am
+1
-3
extra/yassl/taocrypt/test/Makefile.am
extra/yassl/taocrypt/test/Makefile.am
+1
-3
extra/yassl/testsuite/Makefile.am
extra/yassl/testsuite/Makefile.am
+2
-3
No files found.
config/ac-macros/yassl.m4
View file @
08cdf195
...
...
@@ -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
View file @
08cdf195
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
View file @
08cdf195
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
View file @
08cdf195
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment