diff options
| -rw-r--r-- | config/ac-macros/yassl.m4 | 2 | ||||
| -rw-r--r-- | libmysql/Makefile.am | 6 | ||||
| -rw-r--r-- | libmysql_r/Makefile.am | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/config/ac-macros/yassl.m4 b/config/ac-macros/yassl.m4 index b4160ad2a99..0de93670663 100644 --- a/config/ac-macros/yassl.m4 +++ b/config/ac-macros/yassl.m4 @@ -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" ]) diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am index a3e16b521a9..2c7dc572b5e 100644 --- a/libmysql/Makefile.am +++ b/libmysql/Makefile.am @@ -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 diff --git a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am index 11e65a28a19..7bd3b0f4bbe 100644 --- a/libmysql_r/Makefile.am +++ b/libmysql_r/Makefile.am @@ -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 |