diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-10-18 15:43:59 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-10-18 15:43:59 +0200 |
| commit | 69585b215b6ca854f9a0757787242df30193946f (patch) | |
| tree | 710b8c5ba5604cf18f75c3f2e6e10ccc0fcb9003 /libmysql_r/Makefile.am | |
| parent | b50eb4cd42d2d5073afb2af5af8b19c825a9cca1 (diff) | |
| download | mariadb-git-69585b215b6ca854f9a0757787242df30193946f.tar.gz | |
Bug #12985 Do-mysqlclient-test: Can't find -lyassl when linking
- Use yassl_includes and yassl_libs instead of openssl_includes and openssl_libs
to avoid that mysql_config returns that libyassl and libtaocrypt are needed for linking.
client/Makefile.am:
Add yassl_includes
config/ac-macros/yassl.m4:
Use own variables for yassl, don't intrude on openssl
configure.in:
Add yassl_libs to lib_DEPENDENCIES and CLIENT_LIBS
libmysql/Makefile.am:
Add yassl_includes
libmysql_r/Makefile.am:
Add yassl_libs and yassl_includes
libmysqld/Makefile.am:
Add yassl_includes
server-tools/instance-manager/Makefile.am:
Add yassl includes and lib
sql/Makefile.am:
Add yassl includes and libe
vio/Makefile.am:
Add yassl includes and libe
Diffstat (limited to 'libmysql_r/Makefile.am')
| -rw-r--r-- | libmysql_r/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am index 65255066d45..6ab09368cc5 100644 --- a/libmysql_r/Makefile.am +++ b/libmysql_r/Makefile.am @@ -22,10 +22,10 @@ target = libmysqlclient_r.la target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@ -LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@ +LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@ @yassl_libs@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ - $(openssl_includes) @ZLIB_INCLUDES@ + $(openssl_includes) $(yassl_includes) @ZLIB_INCLUDES@ ## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include include $(top_srcdir)/libmysql/Makefile.shared |