diff options
| author | unknown <serg@serg.mylan> | 2006-04-03 12:07:18 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2006-04-03 12:07:18 +0200 |
| commit | 70f4dbaa6e67d61df5ad19da47bcd2338e4eb7f3 (patch) | |
| tree | a4e5a4346d6ab0c3a440a9ee91f896d3f17d0b11 /libmysql | |
| parent | b5ca723613666bc6472de8d02e50fee7ea7785ef (diff) | |
| download | mariadb-git-70f4dbaa6e67d61df5ad19da47bcd2338e4eb7f3.tar.gz | |
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
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/Makefile.am | 6 | ||||
| -rw-r--r-- | libmysql/Makefile.shared | 5 |
2 files changed, 6 insertions, 5 deletions
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) |