From 70f4dbaa6e67d61df5ad19da47bcd2338e4eb7f3 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 3 Apr 2006 12:07:18 +0200 Subject: [PATCH 1/2] 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 --- config/ac-macros/yassl.m4 | 2 +- libmysql/Makefile.am | 6 +----- libmysql/Makefile.shared | 5 +++++ libmysql_r/Makefile.am | 6 +----- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/config/ac-macros/yassl.m4 b/config/ac-macros/yassl.m4 index 0de93670663..c736f2f10f2 100644 --- a/config/ac-macros/yassl.m4 +++ b/config/ac-macros/yassl.m4 @@ -39,5 +39,5 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ AC_SUBST(yassl_libs) AC_SUBST(yassl_includes) AC_SUBST(yassl_dir) - AM_CONDITIONAL([HAVE_YASSL], [ test "with_yassl" = "yes" ]) + AM_CONDITIONAL([HAVE_YASSL], [ test "$with_yassl" = "yes" ]) ]) diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am index 2c7dc572b5e..b580884e934 100644 --- a/libmysql/Makefile.am +++ b/libmysql/Makefile.am @@ -29,11 +29,7 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ include $(srcdir)/Makefile.shared libmysqlclient_la_SOURCES = $(target_sources) -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_LIBADD = $(target_libadd) $(yassl_las) libmysqlclient_la_LDFLAGS = $(target_ldflags) EXTRA_DIST = Makefile.shared libmysql.def noinst_HEADERS = client_settings.h diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index c4c9c0036e2..a641bdf2f10 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -87,6 +87,11 @@ DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \ -DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \ -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 #bmove_upp.lo: $(LTCHARSET_OBJS) diff --git a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am index 7bd3b0f4bbe..d28f31b2258 100644 --- a/libmysql_r/Makefile.am +++ b/libmysql_r/Makefile.am @@ -32,11 +32,7 @@ include $(top_srcdir)/libmysql/Makefile.shared libmysql_dir = $(top_srcdir)/libmysql libmysqlclient_r_la_SOURCES = $(target_sources) -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_LIBADD = $(target_libadd) $(yassl_las) libmysqlclient_r_la_LDFLAGS = $(target_ldflags) # This is called from the toplevel makefile From 57cfa4d17c1e2e05fa71e19c126a59c8a6a03c81 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 3 Apr 2006 11:54:09 -0400 Subject: [PATCH 2/2] .libs is no longer used when compiling netware netware/BUILD/compile-linux-tools: .libs/sql is no longer used when compiling netware --- netware/BUILD/compile-linux-tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netware/BUILD/compile-linux-tools b/netware/BUILD/compile-linux-tools index fab92b8d4df..14422ea5a3f 100755 --- a/netware/BUILD/compile-linux-tools +++ b/netware/BUILD/compile-linux-tools @@ -57,7 +57,7 @@ make cp extra/comp_err extra/comp_err.linux cp libmysql/conf_to_src libmysql/conf_to_src.linux #cp libmysql_r/conf_to_src libmysql_r/conf_to_src.linux -cp sql/.libs/gen_lex_hash sql/gen_lex_hash.linux +cp sql/gen_lex_hash sql/gen_lex_hash.linux cp strings/conf_to_src strings/conf_to_src.linux # Delete mysql_version.h