Commit 2533dd08 authored by unknown's avatar unknown
Browse files

BUG#12985 Do-mysqlclient-test: Can't find -lyassl when linking 

 - Remove yassl_libsfrom CLIENT_LIBS var
 - Add yassl_libs to libmysql and libmysqld


config/ac-macros/yassl.m4:
  Add variable yassl_libs_with_path variable for libmysqld
configure.in:
  Don't add yassl_libs to CLIENT_LIBS var since clients will be linked with libmysqlclient that includes yassl libs.
extra/yassl/src/Makefile.am:
  Make a normal .a lib
extra/yassl/taocrypt/src/Makefile.am:
  Make a normal .a lib
libmysql/Makefile.am:
  Add yassl_libs to libmysql
libmysqld/Makefile.am:
  Add yassl_libss_with_path to libmysqld
parent 69585b21

config/ac-macros/yassl.m4

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ 
    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_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.])

  else
@@ -25,5 +26,6 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ 
  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
@@ -2423,7 +2423,7 @@ then 
  AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should be client be thread safe])

fi



CLIENT_LIBS="$NON_THREADED_LIBS $openssl_libs $yassl_libs $ZLIB_LIBS $STATIC_NSS_FLAGS"

CLIENT_LIBS="$NON_THREADED_LIBS $openssl_libs $ZLIB_LIBS $STATIC_NSS_FLAGS"



AC_SUBST(CLIENT_LIBS)

AC_SUBST(NON_THREADED_LIBS)

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

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



noinst_LTLIBRARIES = libtaocrypt.la

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

noinst_LIBRARIES = libtaocrypt.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 integer.cpp \

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

	template_instnt.cpp

libmysql/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


target =	libmysqlclient.la

target_defs =	-DUNDEF_THREADS_HACK -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@

LIBS =		@CLIENT_LIBS@

LIBS =		@CLIENT_LIBS@ @yassl_libs@

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

		$(openssl_includes) $(yassl_includes) @ZLIB_INCLUDES@