diff options
| author | monty@mysql.com <> | 2004-10-06 19:14:33 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-10-06 19:14:33 +0300 |
| commit | 62f3cd6a31d3c1ffe7ad17d9de862a3c0859f56a (patch) | |
| tree | 4e2cfa6a6a8032773454e22aa802b2798b2935b8 /acinclude.m4 | |
| parent | 96458f8f64641d5b974a17733af8c709b513bfe0 (diff) | |
| parent | 0944bed7fcb59fb38230a750bd820a22b3b6b476 (diff) | |
| download | mariadb-git-62f3cd6a31d3c1ffe7ad17d9de862a3c0859f56a.tar.gz | |
Merge with 4.0 for 4.1 release
Noteworthy:
- New HANDLER code
- New multi-update-grant-check code
- Table lock code in ha_innodb.cc was not applied
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index c7d7ba0e9c9..7f25b447f10 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -976,7 +976,7 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [ AC_DEFUN([MYSQL_CHECK_OPENSSL], [ AC_MSG_CHECKING(for OpenSSL) AC_ARG_WITH([openssl], - [ --with-openssl Include the OpenSSL support], + [ --with-openssl[=DIR] Include the OpenSSL support], [openssl="$withval"], [openssl=no]) @@ -994,8 +994,19 @@ AC_MSG_CHECKING(for OpenSSL) [openssl_libs="$withval"], [openssl_libs=""]) - if test "$openssl" = "yes" + if test "$openssl" != "no" then + if test "$openssl" != "yes" + then + if test -z "$openssl_includes" + then + openssl_includes="$openssl/include" + fi + if test -z "$openssl_libs" + then + openssl_libs="$openssl/lib" + fi + fi MYSQL_FIND_OPENSSL([$openssl_includes], [$openssl_libs]) #force VIO use vio_dir="vio" @@ -1031,6 +1042,14 @@ AC_MSG_CHECKING(for OpenSSL) NON_THREADED_CLIENT_LIBS="$NON_THREADED_CLIENT_LIBS $openssl_libs" else AC_MSG_RESULT(no) + if test ! -z "$openssl_includes" + then + AC_MSG_ERROR(Can't have --with-openssl-includes without --with-openssl); + fi + if test ! -z "$openssl_libs" + then + AC_MSG_ERROR(Can't have --with-openssl-libs without --with-openssl); + fi fi AC_SUBST(openssl_libs) AC_SUBST(openssl_includes) |