diff options
| author | unknown <msvensson@devsrv-b.mysql.com> | 2005-11-24 17:17:36 +0100 |
|---|---|---|
| committer | unknown <msvensson@devsrv-b.mysql.com> | 2005-11-24 17:17:36 +0100 |
| commit | df1a6e0f5c51db75a04f9c2349e9d643c8137826 (patch) | |
| tree | fbf6befc3a175c1c3bb107e8d632bc549a63a683 /libmysqld/examples/Makefile.am | |
| parent | 613f74fac4f590ff8f1433b9624a7406f6119a73 (diff) | |
| download | mariadb-git-df1a6e0f5c51db75a04f9c2349e9d643c8137826.tar.gz | |
Bug #15168 yassl failure on amd64
- Use libtool to build libraries
config/ac-macros/yassl.m4:
If necessary, disable inlining for all files in libtaocrypt not only integer.cpp
Remove ver yassl_libs_with_path, not used anymore
extra/yassl/src/Makefile.am:
Let libtool build libraries
extra/yassl/taocrypt/src/Makefile.am:
Let libtool build libraries
Only build one lib
libmysqld/Makefile.am:
Dont include yassl libs in libmysqld
libmysqld/examples/Makefile.am:
Add yassl includes and libs when linking examples with libmysqld
Diffstat (limited to 'libmysqld/examples/Makefile.am')
| -rw-r--r-- | libmysqld/examples/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am index 925a6573efe..414cf63b003 100644 --- a/libmysqld/examples/Makefile.am +++ b/libmysqld/examples/Makefile.am @@ -34,8 +34,8 @@ link_sources: DEFS = -DEMBEDDED_LIBRARY INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir) \ -I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \ - $(openssl_includes) -LIBS = @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ + $(openssl_includes) $(yassl_includes) +LIBS = @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs) LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS) mysqltest_embedded_LINK = $(CXXLINK) |