From 5df9964651f7027178b16a2cd45e6084ffeeb690 Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Tue, 23 May 2006 10:07:07 +0200
Subject: Bug#20002 Old --with-openssl and --with-yassl options just silently
 ignored  - Terminate configure with error(and message) if --with-yassl or
 --with-openssl is used.

---
 config/ac-macros/ssl.m4 | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/ac-macros/ssl.m4 b/config/ac-macros/ssl.m4
index 14f3dcc9bc8..0f2f207c36f 100644
--- a/config/ac-macros/ssl.m4
+++ b/config/ac-macros/ssl.m4
@@ -23,7 +23,7 @@ AC_DEFUN([MYSQL_USE_BUNDLED_YASSL], [
     extra/yassl/src/Makefile dnl
     extra/yassl/testsuite/Makefile)
 
-  with_yassl="yes"
+  with_bundled_yassl="yes"
 
   yassl_dir="yassl"
   AC_SUBST([yassl_dir])
@@ -174,6 +174,16 @@ AC_MSG_CHECKING(for SSL)
               [mysql_ssl_dir="$withval"],
               [mysql_ssl_dir=no])
 
+  if test "$with_yassl"
+  then
+    AC_MSG_ERROR([The flag --with-yassl is deprecated, use --with-ssl])
+  fi
+
+  if test "$with_openssl"
+  then
+    AC_MSG_ERROR([The flag --with-openssl is deprecated, use --with-ssl])
+  fi
+
   case "$mysql_ssl_dir" in
     "no")
       #
@@ -196,5 +206,5 @@ AC_MSG_CHECKING(for SSL)
       MYSQL_FIND_OPENSSL([$mysql_ssl_dir])
       ;;
   esac
-  AM_CONDITIONAL([HAVE_YASSL], [ test "$with_yassl" = "yes" ])
+  AM_CONDITIONAL([HAVE_YASSL], [ test "$with_bundled_yassl" = "yes" ])
 ])
-- 
cgit v1.2.1