database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Add yassl libs to libmysqlclient_r as well.

Browse Source 
Add a symlink to extra/yassl/include/openssl to inlude/ when compiling with yassl
Similiar to readline)
This commit is contained in:
msvensson@neptunus.(none)
2006-01-09 10:01:07 +01:00
parent b1214d232e
commit dad7268273
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/ac-macros/yassl.m4
View File

@@ -30,7 +30,9 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [
;; ;;
esac esac
AC_SUBST([yassl_taocrypt_extra_cxxflags]) 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 else
yassl_dir="" yassl_dir=""
AC_MSG_RESULT(no) AC_MSG_RESULT(no)

3
include/Makefile.am
View File

@@ -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.in my_handler.h my_time.h decimal.h
# mysql_version.h are generated # 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 # Some include files that may be moved and patched by configure
DISTCLEANFILES = sched.h $(CLEANFILES) DISTCLEANFILES = sched.h $(CLEANFILES)
@@ -41,6 +41,7 @@ DISTCLEANFILES = sched.h $(CLEANFILES)
link_sources: link_sources:
-$(RM) -fr readline -$(RM) -fr readline
@readline_h_ln_cmd@ @readline_h_ln_cmd@
@yassl_h_ln_cmd@
my_config.h: ../config.h my_config.h: ../config.h
$(CP) ../config.h my_config.h $(CP) ../config.h my_config.h

4
libmysql_r/Makefile.am
View File

@@ -22,7 +22,7 @@
target = libmysqlclient_r.la target = libmysqlclient_r.la
target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@ 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 \ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
$(openssl_includes) $(yassl_includes) @ZLIB_INCLUDES@ $(openssl_includes) $(yassl_includes) @ZLIB_INCLUDES@
@@ -32,7 +32,7 @@ include $(top_srcdir)/libmysql/Makefile.shared
libmysql_dir = $(top_srcdir)/libmysql libmysql_dir = $(top_srcdir)/libmysql
libmysqlclient_r_la_SOURCES = $(target_sources) 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) libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
# This is called from the toplevel makefile # This is called from the toplevel makefile