summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorunknown <svoj@mysql.com>2005-06-12 18:18:46 +0500
committerunknown <svoj@mysql.com>2005-06-12 18:18:46 +0500
commitc0f99623e70a6f4a2c5c80ba00d31ba517529f6b (patch)
treeb85af950dec5e1657f0299eb81122f1953146d41 /config
parent77a98e8b23c67339fc428fd08146b0d040338f7d (diff)
downloadmariadb-git-c0f99623e70a6f4a2c5c80ba00d31ba517529f6b.tar.gz
WL#2286 - Compile MySQL w/YASSL support
Fix for link failures on boxes with non-gnu compiler. client/Makefile.am: Add a dummy C++ file to client suite to make libtool use a C++ linker: this lets client suite link when using yaSSL and a non-gcc C++ compiler. config/ac-macros/yassl.m4: HAVE_YASSL conditional is used to add dummy C++ file if configured with yaSSL. tests/Makefile.am: Add a dummy C++ file to tests to make libtool use a C++ linker: this lets tests link when using yaSSL and a non-gcc C++ compiler. vio/Makefile.am: Use dummy C++ file if configured with yaSSL only.
Diffstat (limited to 'config')
-rw-r--r--config/ac-macros/yassl.m41
1 files changed, 1 insertions, 0 deletions
diff --git a/config/ac-macros/yassl.m4 b/config/ac-macros/yassl.m4
index ddacde51c2a..fb7c89181df 100644
--- a/config/ac-macros/yassl.m4
+++ b/config/ac-macros/yassl.m4
@@ -30,4 +30,5 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [
AC_SUBST(openssl_libs)
AC_SUBST(openssl_includes)
AC_SUBST(yassl_dir)
+ AM_CONDITIONAL([HAVE_YASSL], [ test "$yassl" = "yes" ])
])