mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build

Browse source 
into  mysql.com:/home/kent/bk/make-dist-stable/mysql-5.1-build
This commit is contained in:
kent@kent-amd64.(none) 2007-09-26 18:49:09 +02:00
commit c7c8f41894
13 changed files with 99 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,14 +15,6 @@ dnl Add defines so yassl is built and linked with
dnl ---------------------------------------------------------------------------
AC_DEFUN([MYSQL_USE_BUNDLED_YASSL], [
AC_CONFIG_FILES(extra/yassl/Makefile dnl
extra/yassl/taocrypt/Makefile dnl
extra/yassl/taocrypt/benchmark/Makefile dnl
extra/yassl/taocrypt/src/Makefile dnl
extra/yassl/taocrypt/test/Makefile dnl
extra/yassl/src/Makefile dnl
extra/yassl/testsuite/Makefile)
with_bundled_yassl="yes"
yassl_dir="yassl"
@ -167,6 +159,15 @@ dnl macro bails out with error.
dnl
dnl ------------------------------------------------------------------------
AC_DEFUN([MYSQL_CHECK_SSL], [
AC_CONFIG_FILES(extra/yassl/Makefile dnl
extra/yassl/taocrypt/Makefile dnl
extra/yassl/taocrypt/benchmark/Makefile dnl
extra/yassl/taocrypt/src/Makefile dnl
extra/yassl/taocrypt/test/Makefile dnl
extra/yassl/src/Makefile dnl
extra/yassl/testsuite/Makefile)
AC_MSG_CHECKING(for SSL)
AC_ARG_WITH([ssl],
[ --with-ssl[=DIR] Include SSL support],

7
config/ac-macros/zlib.m4
View file

@ -64,6 +64,9 @@ dnl installation dir ($pkglibdir), so ZLIB_DEPS is set to point to
dnl $pkglibdir.
AC_DEFUN([MYSQL_CHECK_ZLIB_WITH_COMPRESS], [
AC_CONFIG_FILES(zlib/Makefile)
AC_MSG_CHECKING([for zlib compression library])
case $SYSTEM_TYPE in
*netware* | *modesto*)
@ -124,10 +127,6 @@ case $SYSTEM_TYPE in
fi
;;
esac
if test -n "$zlib_dir"
then
AC_CONFIG_FILES(zlib/Makefile)
fi
])
dnl ------------------------------------------------------------------------