Commit 70f4dbaa authored by unknown's avatar unknown

yassl link problem fixed


config/ac-macros/yassl.m4:
  typo
libmysql/Makefile.am:
  move common code to Makefile.shared
libmysql/Makefile.shared:
  move common code to Makefile.shared
libmysql_r/Makefile.am:
  move common code to Makefile.shared
parent b5ca7236
...@@ -39,5 +39,5 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ ...@@ -39,5 +39,5 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [
AC_SUBST(yassl_libs) AC_SUBST(yassl_libs)
AC_SUBST(yassl_includes) AC_SUBST(yassl_includes)
AC_SUBST(yassl_dir) AC_SUBST(yassl_dir)
AM_CONDITIONAL([HAVE_YASSL], [ test "with_yassl" = "yes" ]) AM_CONDITIONAL([HAVE_YASSL], [ test "$with_yassl" = "yes" ])
]) ])
...@@ -29,11 +29,7 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ ...@@ -29,11 +29,7 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
include $(srcdir)/Makefile.shared include $(srcdir)/Makefile.shared
libmysqlclient_la_SOURCES = $(target_sources) libmysqlclient_la_SOURCES = $(target_sources)
libmysqlclient_la_LIBADD = $(target_libadd) libmysqlclient_la_LIBADD = $(target_libadd) $(yassl_las)
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) libmysqlclient_la_LDFLAGS = $(target_ldflags)
EXTRA_DIST = Makefile.shared libmysql.def EXTRA_DIST = Makefile.shared libmysql.def
noinst_HEADERS = client_settings.h noinst_HEADERS = client_settings.h
......
...@@ -87,6 +87,11 @@ DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \ ...@@ -87,6 +87,11 @@ DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
-DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \ -DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \
-DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs) -DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs)
if HAVE_YASSL
yassl_las = $(top_srcdir)/extra/yassl/src/libyassl.la \
$(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.la
endif
# The automatic dependencies miss this # The automatic dependencies miss this
#bmove_upp.lo: $(LTCHARSET_OBJS) #bmove_upp.lo: $(LTCHARSET_OBJS)
......
...@@ -32,11 +32,7 @@ include $(top_srcdir)/libmysql/Makefile.shared ...@@ -32,11 +32,7 @@ include $(top_srcdir)/libmysql/Makefile.shared
libmysql_dir = $(top_srcdir)/libmysql libmysql_dir = $(top_srcdir)/libmysql
libmysqlclient_r_la_SOURCES = $(target_sources) libmysqlclient_r_la_SOURCES = $(target_sources)
libmysqlclient_r_la_LIBADD = $(target_libadd) libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_las)
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) libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
# This is called from the toplevel makefile # This is called from the toplevel makefile
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment