Commit aecc67b2 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

into  mysql.com:/usr/local/mysql/mysql-5.0
parents 3adea9ce a796fc48

config/ac-macros/yassl.m4

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ 
    yassl_dir="extra/yassl"

    yassl_libs="-L\$(top_srcdir)/extra/yassl/src -lyassl -L\$(top_srcdir)/extra/yassl/taocrypt/src -ltaocrypt"

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

    yassl_libs_with_path="\$(top_srcdir)/extra/yassl/src/libyassl.la \$(top_srcdir)/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
@@ -35,6 +36,7 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ 
    AC_MSG_RESULT(no)

  fi

  AC_SUBST(yassl_libs)

  AC_SUBST(yassl_libs_with_path)

  AC_SUBST(yassl_includes)

  AC_SUBST(yassl_dir)

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

libmysql/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -22,14 +22,14 @@ 


target =	libmysqlclient.la

target_defs =	-DUNDEF_THREADS_HACK -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@

LIBS =		@CLIENT_LIBS@ @yassl_libs@

LIBS =		@CLIENT_LIBS@ 

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

		$(openssl_includes) $(yassl_includes) @ZLIB_INCLUDES@



include $(srcdir)/Makefile.shared



libmysqlclient_la_SOURCES = $(target_sources)

libmysqlclient_la_LIBADD = $(target_libadd)

libmysqlclient_la_LIBADD = $(target_libadd) $(yassl_libs_with_path)

libmysqlclient_la_LDFLAGS = $(target_ldflags)

EXTRA_DIST = Makefile.shared libmysql.def

noinst_HEADERS = client_settings.h