Commit 872d1d71 authored by unknown's avatar unknown
Browse files

Makefile.am, yassl.m4: 

  Enable automake to determine dependency on yaSSL, by explicitly
  listing the .la files in Makefile.am, instead of using
  'yassl_libs_with_path', bug#18273


config/ac-macros/yassl.m4:
  Enable automake to determine dependency on yaSSL, by explicitly
  listing the .la files in Makefile.am, instead of using
  'yassl_libs_with_path', bug#18273
libmysql/Makefile.am:
  Enable automake to determine dependency on yaSSL, by explicitly
  listing the .la files in Makefile.am, instead of using
  'yassl_libs_with_path', bug#18273
libmysql_r/Makefile.am:
  Enable automake to determine dependency on yaSSL, by explicitly
  listing the .la files in Makefile.am, instead of using
  'yassl_libs_with_path', bug#18273
parent fa7e5ed5

config/ac-macros/yassl.m4

+0 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 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
@@ -38,7 +37,6 @@ 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

+5 −1
Original line number Diff line number Diff line
@@ -29,7 +29,11 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ 
include $(srcdir)/Makefile.shared



libmysqlclient_la_SOURCES = $(target_sources)

libmysqlclient_la_LIBADD = $(target_libadd) $(yassl_libs_with_path)

libmysqlclient_la_LIBADD = $(target_libadd)

if HAVE_YASSL

libmysqlclient_la_LIBADD+= $(top_srcdir)/extra/yassl/src/libyassl.la \

			   $(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.la

endif

libmysqlclient_la_LDFLAGS = $(target_ldflags)

EXTRA_DIST = Makefile.shared libmysql.def

noinst_HEADERS = client_settings.h

libmysql_r/Makefile.am

+5 −1
Original line number Diff line number Diff line
@@ -32,7 +32,11 @@ include $(top_srcdir)/libmysql/Makefile.shared 
libmysql_dir = $(top_srcdir)/libmysql



libmysqlclient_r_la_SOURCES = $(target_sources)

libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_libs_with_path)

libmysqlclient_r_la_LIBADD = $(target_libadd)

if HAVE_YASSL

libmysqlclient_r_la_LIBADD+= $(top_srcdir)/extra/yassl/src/libyassl.la \

			     $(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.la

endif

libmysqlclient_r_la_LDFLAGS = $(target_ldflags)



# This is called from the toplevel makefile