Commit 92f698f9 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


config/ac-macros/yassl.m4:
  Auto merged
configure.in:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
extra/yassl/taocrypt/src/Makefile.am:
  Manual merge
parents 268eb664 2533dd08

client/Makefile.am

+4 −2
Original line number Diff line number Diff line
@@ -22,8 +22,10 @@ else 
  yassl_dummy_link_fix=

endif

#AUTOMAKE_OPTIONS =              nostdinc

INCLUDES =			-I$(top_builddir)/include -I$(top_srcdir)/include \

				-I$(top_srcdir)/regex $(openssl_includes)

INCLUDES =			-I$(top_builddir)/include \

				-I$(top_srcdir)/include \

				-I$(top_srcdir)/regex \

                                $(openssl_includes) $(yassl_includes) 

LIBS =				@CLIENT_LIBS@

LDADD=				@CLIENT_EXTRA_LDFLAGS@ \

                                $(top_builddir)/libmysql/libmysqlclient.la

config/ac-macros/yassl.m4

+6 −6
Original line number Diff line number Diff line
@@ -15,10 +15,9 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ 
    fi

    AC_MSG_RESULT([using bundled yaSSL])

    yassl_dir="extra/yassl"

    openssl_libs="\

    -L\$(top_builddir)/extra/yassl/src -lyassl\

    -L\$(top_builddir)/extra/yassl/taocrypt/src -ltaocrypt"

    openssl_includes="-I\$(top_srcdir)/extra/yassl/include"

    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"

    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
@@ -36,8 +35,9 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ 
    yassl_dir=""

    AC_MSG_RESULT(no)

  fi

  AC_SUBST(openssl_libs)

  AC_SUBST(openssl_includes)

  AC_SUBST(yassl_libs)

  AC_SUBST(yassl_includes)

  AC_SUBST(yassl_dir)

  AC_SUBST(yassl_libs_with_path)

  AM_CONDITIONAL([HAVE_YASSL], [ test "with_yassl" = "yes" ])

])

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -1129,7 +1129,7 @@ dnl Is this the right match for DEC OSF on alpha? 
        sql/Makefile.in)

          # Use gen_lex_hash.linux instead of gen_lex_hash

          # Add library dependencies to mysqld_DEPENDENCIES

          lib_DEPENDENCIES="\$(bdb_libs_with_path) \$(innodb_libs) \$(ndbcluster_libs) \$(pstack_libs) \$(innodb_system_libs) \$(openssl_libs)"

          lib_DEPENDENCIES="\$(bdb_libs_with_path) \$(innodb_libs) \$(ndbcluster_libs) \$(pstack_libs) \$(innodb_system_libs) \$(openssl_libs) \$(yassl_libs)"

          cat > $filesed << EOF

s,\(^.*\$(MAKE) gen_lex_hash\)\$(EXEEXT),#\1,

s,\(\./gen_lex_hash\)\$(EXEEXT),\1.linux,

extra/yassl/src/Makefile.am

+2 −2
Original line number Diff line number Diff line 
INCLUDES = -I../include -I../taocrypt/include -I../mySTL



noinst_LTLIBRARIES = libyassl.la

libyassl_la_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \

noinst_LIBRARIES = libyassl.a

libyassl_a_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.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

EXTRA_DIST = ../include/*.hpp ../include/openssl/*.h

extra/yassl/taocrypt/src/Makefile.am

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



noinst_LTLIBRARIES = libtaocrypt.la libtaoint.la

libtaocrypt_la_SOURCES  = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \

noinst_LIBRARIES = libtaocrypt.a libtaoint.a

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 \

	md2.cpp md5.cpp misc.cpp random.cpp ripemd.cpp rsa.cpp sha.cpp \

	template_instnt.cpp

libtaocrypt_la_LIBADD = libtaoint.la

libtaoint_la_SOURCES = integer.cpp

libtaoint_la_CXXFLAGS = @yassl_integer_extra_cxxflags@

libtaocrypt_a_LIBADD = libtaoint.a

libtaoint_a_SOURCES = integer.cpp

libtaoint_a_CXXFLAGS = @yassl_integer_extra_cxxflags@

EXTRA_DIST = ../include/*.hpp

AM_CXXFLAGS = -DYASSL_PURE_C