mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
Add yassl libs to libmysqlclient_r as well.
Add a symlink to extra/yassl/include/openssl to inlude/ when compiling with yassl Similiar to readline)
This commit is contained in:
parent
b1214d232e
commit
dad7268273
3 changed files with 7 additions and 4 deletions
|
@ -30,7 +30,9 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [
|
|||
;;
|
||||
esac
|
||||
AC_SUBST([yassl_taocrypt_extra_cxxflags])
|
||||
|
||||
# Link extra/yassl/include/openssl subdir to include/
|
||||
yassl_h_ln_cmd="\$(LN) -s \$(top_srcdir)/extra/yassl/include/openssl openssl"
|
||||
AC_SUBST(yassl_h_ln_cmd)
|
||||
else
|
||||
yassl_dir=""
|
||||
AC_MSG_RESULT(no)
|
||||
|
|
|
@ -33,7 +33,7 @@ noinst_HEADERS = config-win.h config-os2.h config-netware.h \
|
|||
mysql_version.h.in my_handler.h my_time.h decimal.h
|
||||
|
||||
# mysql_version.h are generated
|
||||
CLEANFILES = mysql_version.h my_config.h readline
|
||||
CLEANFILES = mysql_version.h my_config.h readline openssl
|
||||
|
||||
# Some include files that may be moved and patched by configure
|
||||
DISTCLEANFILES = sched.h $(CLEANFILES)
|
||||
|
@ -41,6 +41,7 @@ DISTCLEANFILES = sched.h $(CLEANFILES)
|
|||
link_sources:
|
||||
-$(RM) -fr readline
|
||||
@readline_h_ln_cmd@
|
||||
@yassl_h_ln_cmd@
|
||||
|
||||
my_config.h: ../config.h
|
||||
$(CP) ../config.h my_config.h
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
target = libmysqlclient_r.la
|
||||
target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@
|
||||
LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@ @yassl_libs@
|
||||
LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@
|
||||
|
||||
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
|
||||
$(openssl_includes) $(yassl_includes) @ZLIB_INCLUDES@
|
||||
|
@ -32,7 +32,7 @@ include $(top_srcdir)/libmysql/Makefile.shared
|
|||
libmysql_dir = $(top_srcdir)/libmysql
|
||||
|
||||
libmysqlclient_r_la_SOURCES = $(target_sources)
|
||||
libmysqlclient_r_la_LIBADD = $(target_libadd)
|
||||
libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_libs_with_path)
|
||||
libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
|
||||
|
||||
# This is called from the toplevel makefile
|
||||
|
|
Loading…
Reference in a new issue