mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug#20002 Old --with-openssl and --with-yassl options just silently ignored

Browse source 
- Terminate configure with error(and message) if --with-yassl or --with-openssl is used.


config/ac-macros/ssl.m4:
  Add error message if --with-yassl or --with-openssl is used
This commit is contained in:
unknown 2006-05-23 10:07:07 +02:00
parent f29550142c
commit 1d41f34f9a
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
config/ac-macros/ssl.m4
View file

@ -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" ])
])