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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
93bbfc8a
Commit
93bbfc8a
authored
Sep 21, 2006
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use a direct reference to the yassl and taocrypt libtool libraries to link with
parent
25fa9d26
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 @
93bbfc8a
...
@@ -18,7 +18,8 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [
...
@@ -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
...
...
extra/yassl/taocrypt/benchmark/Makefile.am
View file @
93bbfc8a
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
extra/yassl/taocrypt/test/Makefile.am
View file @
93bbfc8a
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
extra/yassl/testsuite/Makefile.am
View file @
93bbfc8a
...
@@ -4,10 +4,9 @@ testsuite_SOURCES = testsuite.cpp ../taocrypt/test/test.cpp \
...
@@ -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
...
...
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