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
3879027a
Commit
3879027a
authored
Nov 25, 2005
by
msvensson@devsrv-b.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15168/my50-bug15168
into devsrv-b.mysql.com:/space/magnus/mysql-5.0
parents
e6708aa0
8f457699
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
20 deletions
+13
-20
config/ac-macros/yassl.m4
config/ac-macros/yassl.m4
+4
-6
extra/yassl/src/Makefile.am
extra/yassl/src/Makefile.am
+2
-2
extra/yassl/taocrypt/src/Makefile.am
extra/yassl/taocrypt/src/Makefile.am
+4
-8
libmysqld/Makefile.am
libmysqld/Makefile.am
+1
-2
libmysqld/examples/Makefile.am
libmysqld/examples/Makefile.am
+2
-2
No files found.
config/ac-macros/yassl.m4
View file @
3879027a
...
@@ -16,7 +16,6 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [
...
@@ -16,7 +16,6 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [
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="-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"
yassl_includes="-I\$(top_srcdir)/extra/yassl/include"
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.])
...
@@ -24,12 +23,12 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [
...
@@ -24,12 +23,12 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [
yassl_integer_extra_cxxflags=""
yassl_integer_extra_cxxflags=""
case $host_cpu--$CXX_VERSION in
case $host_cpu--$CXX_VERSION in
sparc*--*Sun*C++*5.6*)
sparc*--*Sun*C++*5.6*)
# Disable inlining when compiling taocrypt/src/
integer.cpp
# Disable inlining when compiling taocrypt/src/
yassl_
integer
_extra_cxxflags="+d"
yassl_
taocrypt
_extra_cxxflags="+d"
AC_MSG_NOTICE([disabling inlining for yassl/taocrypt/src/
integer.cpp
])
AC_MSG_NOTICE([disabling inlining for yassl/taocrypt/src/])
;;
;;
esac
esac
AC_SUBST([yassl_
integer
_extra_cxxflags])
AC_SUBST([yassl_
taocrypt
_extra_cxxflags])
else
else
yassl_dir=""
yassl_dir=""
...
@@ -38,6 +37,5 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [
...
@@ -38,6 +37,5 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [
AC_SUBST(yassl_libs)
AC_SUBST(yassl_libs)
AC_SUBST(yassl_includes)
AC_SUBST(yassl_includes)
AC_SUBST(yassl_dir)
AC_SUBST(yassl_dir)
AC_SUBST(yassl_libs_with_path)
AM_CONDITIONAL([HAVE_YASSL], [ test "with_yassl" = "yes" ])
AM_CONDITIONAL([HAVE_YASSL], [ test "with_yassl" = "yes" ])
])
])
extra/yassl/src/Makefile.am
View file @
3879027a
INCLUDES
=
-I
../include
-I
../taocrypt/include
-I
../mySTL
INCLUDES
=
-I
../include
-I
../taocrypt/include
-I
../mySTL
noinst_L
IBRARIES
=
libyassl.
a
noinst_L
TLIBRARIES
=
libyassl.l
a
libyassl_a_SOURCES
=
buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp
\
libyassl_
l
a_SOURCES
=
buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp
\
handshake.cpp lock.cpp log.cpp socket_wrapper.cpp ssl.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
template_instnt.cpp timer.cpp yassl_imp.cpp yassl_error.cpp yassl_int.cpp
EXTRA_DIST
=
$(
wildcard
../include/
*
.hpp
)
$(
wildcard
../include/openssl/
*
.h
)
EXTRA_DIST
=
$(
wildcard
../include/
*
.hpp
)
$(
wildcard
../include/openssl/
*
.h
)
...
...
extra/yassl/taocrypt/src/Makefile.am
View file @
3879027a
INCLUDES
=
-I
../include
-I
../../mySTL
INCLUDES
=
-I
../include
-I
../../mySTL
noinst_L
IBRARIES
=
libtaoint.a libtaocrypt.
a
noinst_L
TLIBRARIES
=
libtaocrypt.l
a
libtaoint_a_SOURCES
=
integer.cpp
libtaocrypt_la_SOURCES
=
aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp
\
libtaoint_a_CXXFLAGS
=
@yassl_integer_extra_cxxflags@
libtaocrypt_a_SOURCES
=
aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp
\
coding.cpp dh.cpp des.cpp dsa.cpp file.cpp hash.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
\
md2.cpp md5.cpp misc.cpp random.cpp ripemd.cpp rsa.cpp sha.cpp
\
template_instnt.cpp
template_instnt.cpp
integer.cpp
libtaocrypt_
a_LIBADD
=
libtaoint_a-integer.o
libtaocrypt_
la_CXXFLAGS
=
@yassl_taocrypt_extra_cxxflags@
-DYASSL_PURE_C
EXTRA_DIST
=
$(
wildcard
../include/
*
.hpp
)
EXTRA_DIST
=
$(
wildcard
../include/
*
.hpp
)
AM_CXXFLAGS
=
-DYASSL_PURE_C
libmysqld/Makefile.am
View file @
3879027a
...
@@ -80,8 +80,7 @@ INC_LIB= $(top_builddir)/regex/libregex.a \
...
@@ -80,8 +80,7 @@ INC_LIB= $(top_builddir)/regex/libregex.a \
$(top_builddir)
/mysys/libmysys.a
\
$(top_builddir)
/mysys/libmysys.a
\
$(top_builddir)
/strings/libmystrings.a
\
$(top_builddir)
/strings/libmystrings.a
\
$(top_builddir)
/dbug/libdbug.a
\
$(top_builddir)
/dbug/libdbug.a
\
$(top_builddir)
/vio/libvio.a
\
$(top_builddir)
/vio/libvio.a
@yassl_libs_with_path@
#
#
...
...
libmysqld/examples/Makefile.am
View file @
3879027a
...
@@ -34,8 +34,8 @@ link_sources:
...
@@ -34,8 +34,8 @@ link_sources:
DEFS
=
-DEMBEDDED_LIBRARY
DEFS
=
-DEMBEDDED_LIBRARY
INCLUDES
=
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
-I
$(srcdir)
\
INCLUDES
=
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
-I
$(srcdir)
\
-I
$(top_srcdir)
-I
$(top_srcdir)
/client
-I
$(top_srcdir)
/regex
\
-I
$(top_srcdir)
-I
$(top_srcdir)
/client
-I
$(top_srcdir)
/regex
\
$(openssl_includes)
$(openssl_includes)
$(yassl_includes)
LIBS
=
@LIBS@ @WRAPLIBS@ @CLIENT_LIBS@
LIBS
=
@LIBS@ @WRAPLIBS@ @CLIENT_LIBS@
$(yassl_libs)
LDADD
=
@CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@
$(CXXLDFLAGS)
LDADD
=
@CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@
$(CXXLDFLAGS)
mysqltest_embedded_LINK
=
$(CXXLINK)
mysqltest_embedded_LINK
=
$(CXXLINK)
...
...
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