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 /sql/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 'sql/Makefile.am')
| -rw-r--r-- | sql/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index 4824a75d6fa..5074212e6c8 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -22,7 +22,8 @@ MYSQLBASEdir= $(prefix) INCLUDES = @ZLIB_INCLUDES@ \ @bdb_includes@ @innodb_includes@ @ndbcluster_includes@ \ -I$(top_builddir)/include -I$(top_srcdir)/include \ - -I$(top_srcdir)/regex -I$(srcdir) $(openssl_includes) + -I$(top_srcdir)/regex -I$(srcdir) $(yassl_includes) \ + $(openssl_includes) WRAPLIBS= @WRAPLIBS@ SUBDIRS = share libexec_PROGRAMS = mysqld @@ -42,7 +43,8 @@ mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \ @bdb_libs@ @innodb_libs@ @pstack_libs@ \ @innodb_system_libs@ \ @ndbcluster_libs@ @ndbcluster_system_libs@ \ - $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@ + $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \ + @yassl_libs@ @openssl_libs@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ item_strfunc.h item_timefunc.h item_uniq.h \ item_create.h item_subselect.h item_row.h \ |