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_r | |
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_r')
-rw-r--r-- | libmysql_r/Makefile.am | 6 |
1 files changed, 1 insertions, 5 deletions
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 |