mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 14:02:32 +01:00
c566f9a25f
BUILD/compile-dist: fixes for 'make dist' and 'make distcheck' include yassl in "dist" Makefile.am: fixes for 'make dist' and 'make distcheck' remove double-listing of everything in SUBDIRS and DIST_SUBDIRS remove @yassl_dir@, it belongs to extra/Makefile.am specify --basedir for mysql_install_db, in case builddir (where mysql_install_db is) differs from srcdir (where mysql_fix_privilege_tables.sql is) config/ac-macros/yassl.m4: fixes for 'make dist' and 'make distcheck' create Makefile's only if yassl is used yassl_dir must not include / config/ac-macros/zlib.m4: fixes for 'make dist' and 'make distcheck' create Makefile only if zlib is used configure.in: fixes for 'make dist' and 'make distcheck' create Makefile only if a feature is enabled storage engine dirs must not include / automatically disable readline/libedit/sql-bench if source dir is missing extra/Makefile.am: fixes for 'make dist' and 'make distcheck' remove SUBDIR/DIST_SUBDIR hack libmysql_r/Makefile.am: fixes for 'make dist' and 'make distcheck' when symlinking all files from libmysql/ take into account that srcdir != builddir libmysqld/Makefile.am: fixes for 'make dist' and 'make distcheck' remove fragile promiscuous search for object files if .o file is not where we look for it - extract it from the library mysql-test/ndb/Makefile.am: fixes for 'make dist' and 'make distcheck' ndbcluster script is not a "source" don't forget to cleanup plugin/Makefile.am: fixes for 'make dist' and 'make distcheck' include plugin/fulltext/configure.in template in the distribution storage/Makefile.am: fixes for 'make dist' and 'make distcheck' remove SUBDIRS/DIST_SUBDIRS hack storage/ndb/Makefile.am: fixes for 'make dist' and 'make distcheck' force common.mk.am out of DIST_COMMON (which is otherwise an auto-generated list of Makefile's sources) because it's listed indirectly in EXTRA_DIST, and with bk -r get, a file cannot be copied twice.
42 lines
1.6 KiB
Text
42 lines
1.6 KiB
Text
AC_DEFUN([MYSQL_CHECK_YASSL], [
|
|
AC_MSG_CHECKING(for yaSSL)
|
|
AC_ARG_WITH([yassl], [ --with-yassl Include the yaSSL support],,)
|
|
|
|
if test "$with_yassl" = "yes"
|
|
then
|
|
if test "$openssl" != "no"
|
|
then
|
|
AC_MSG_ERROR([Cannot configure MySQL to use yaSSL and OpenSSL simultaneously.])
|
|
fi
|
|
AC_MSG_RESULT([using bundled yaSSL])
|
|
AC_CONFIG_FILES(extra/yassl/Makefile dnl
|
|
extra/yassl/taocrypt/Makefile dnl
|
|
extra/yassl/taocrypt/src/Makefile dnl
|
|
extra/yassl/src/Makefile)
|
|
yassl_dir="yassl"
|
|
yassl_libs="-L\$(top_srcdir)/extra/yassl/src -lyassl -L\$(top_srcdir)/extra/yassl/taocrypt/src -ltaocrypt"
|
|
yassl_includes="-I\$(top_srcdir)/extra/yassl/include"
|
|
AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.])
|
|
AC_DEFINE([HAVE_YASSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.])
|
|
# System specific checks
|
|
yassl_integer_extra_cxxflags=""
|
|
case $host_cpu--$CXX_VERSION in
|
|
sparc*--*Sun*C++*5.6*)
|
|
# Disable inlining when compiling taocrypt/src/
|
|
yassl_taocrypt_extra_cxxflags="+d"
|
|
AC_MSG_NOTICE([disabling inlining for yassl/taocrypt/src/])
|
|
;;
|
|
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)
|
|
fi
|
|
AC_SUBST(yassl_libs)
|
|
AC_SUBST(yassl_includes)
|
|
AC_SUBST(yassl_dir)
|
|
AM_CONDITIONAL([HAVE_YASSL], [ test "$with_yassl" = "yes" ])
|
|
])
|