diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-11-28 16:28:00 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-11-28 16:28:00 +0100 |
| commit | c565ca2bf2a0e36df5587433446640de3c9d45cd (patch) | |
| tree | e47bb17b3bb06bdbd3562d13a8f7cf83724a0bc3 /libmysql/Makefile.am | |
| parent | 12de238b092c1d1d61b0707050e9fca841bd7243 (diff) | |
| download | mariadb-git-c565ca2bf2a0e36df5587433446640de3c9d45cd.tar.gz | |
Include libyassl.la and libtaocrypt.la in libmysqlclient.la
config/ac-macros/yassl.m4:
Specify path to yassl libs
libmysql/Makefile.am:
Add yassl .la libs to libmysqlclient.la
Diffstat (limited to 'libmysql/Makefile.am')
| -rw-r--r-- | libmysql/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am index 319a9913255..a3e16b521a9 100644 --- a/libmysql/Makefile.am +++ b/libmysql/Makefile.am @@ -22,14 +22,14 @@ target = libmysqlclient.la target_defs = -DUNDEF_THREADS_HACK -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@ -LIBS = @CLIENT_LIBS@ @yassl_libs@ +LIBS = @CLIENT_LIBS@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ $(openssl_includes) $(yassl_includes) @ZLIB_INCLUDES@ include $(srcdir)/Makefile.shared libmysqlclient_la_SOURCES = $(target_sources) -libmysqlclient_la_LIBADD = $(target_libadd) +libmysqlclient_la_LIBADD = $(target_libadd) $(yassl_libs_with_path) libmysqlclient_la_LDFLAGS = $(target_ldflags) EXTRA_DIST = Makefile.shared libmysql.def noinst_HEADERS = client_settings.h |