mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 19:11:46 +01:00
e03f47859f
- Include prefix files that renames all public functions in yaSSLs OpenSSL API to ya<function_name>. They will otherwise conflict with OpenSSL functions if loaded by an application that uses OpenSSL as well as libmysqlclient with yaSSL support. client/Makefile.am: Remove $yassl_includes ...and one "suspicious line" config/ac-macros/yassl.m4: Remove yassl_includes as they are the same as "normal" include extra/yassl/include/openssl/crypto.h: Add include file "prefix_crypto.h" to rename SSL_* functions to yaSSL_* extra/yassl/include/openssl/ssl.h: Add include file "prefix_crypto.h" to rename SSL_* functions to yaSSL_* libmysql/Makefile.am: Remove yassl_includes libmysql_r/Makefile.am: Remove yassl_includes libmysqld/Makefile.am: Remove yassl_includes And one suspicious line libmysqld/examples/Makefile.am: Remove yassl_includes server-tools/instance-manager/Makefile.am: Remove yassl_includes sql/Makefile.am: Remove yassl_includes tools/Makefile.am: Add link with yaSSL libs vio/Makefile.am: Remove yassl_includes extra/yassl/include/openssl/generate_prefix_files.pl: Add utility script to parse the header files to generate the prefix_* files that renames yaSSL SSL_* functions extra/yassl/include/openssl/prefix_crypto.h: Add prefix file for crypto.h extra/yassl/include/openssl/prefix_ssl.h: Add prefix file for ssl.h
43 lines
1.9 KiB
Makefile
43 lines
1.9 KiB
Makefile
# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 2 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software
|
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
if HAVE_YASSL
|
|
yassl_dummy_link_fix= $(top_srcdir)/extra/yassl/src/dummy.cpp
|
|
else
|
|
yassl_dummy_link_fix=
|
|
endif
|
|
INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include \
|
|
$(openssl_includes)
|
|
LDADD= @CLIENT_EXTRA_LDFLAGS@ $(openssl_libs) $(yassl_libs)
|
|
pkglib_LIBRARIES= libvio.a
|
|
noinst_PROGRAMS = test-ssl test-sslserver test-sslclient
|
|
noinst_HEADERS= vio_priv.h
|
|
test_ssl_SOURCES= test-ssl.c $(yassl_dummy_link_fix)
|
|
test_ssl_LDADD= @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a \
|
|
../mysys/libmysys.a ../strings/libmystrings.a \
|
|
$(openssl_libs) $(yassl_libs)
|
|
test_sslserver_SOURCES= test-sslserver.c $(yassl_dummy_link_fix)
|
|
test_sslserver_LDADD= @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a \
|
|
../mysys/libmysys.a ../strings/libmystrings.a \
|
|
$(openssl_libs) $(yassl_libs)
|
|
test_sslclient_SOURCES= test-sslclient.c $(yassl_dummy_link_fix)
|
|
test_sslclient_LDADD= @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a \
|
|
../mysys/libmysys.a ../strings/libmystrings.a \
|
|
$(openssl_libs) $(yassl_libs)
|
|
libvio_a_SOURCES= vio.c viosocket.c viossl.c viosslfactories.c
|
|
|
|
# Don't update the files from bitkeeper
|
|
%::SCCS/s.%
|