summaryrefslogtreecommitdiff
path: root/libmysql/Makefile.am
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2006-04-03 12:07:18 +0200
committerunknown <serg@serg.mylan>2006-04-03 12:07:18 +0200
commit70f4dbaa6e67d61df5ad19da47bcd2338e4eb7f3 (patch)
treea4e5a4346d6ab0c3a440a9ee91f896d3f17d0b11 /libmysql/Makefile.am
parentb5ca723613666bc6472de8d02e50fee7ea7785ef (diff)
downloadmariadb-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/Makefile.am')
-rw-r--r--libmysql/Makefile.am6
1 files changed, 1 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