diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/misc.m4 | 23 | ||||
| -rw-r--r-- | config/ac-macros/openssl.m4 | 3 |
2 files changed, 7 insertions, 19 deletions
diff --git a/config/ac-macros/misc.m4 b/config/ac-macros/misc.m4 index ec0c296a8b2..556cc7625cc 100644 --- a/config/ac-macros/misc.m4 +++ b/config/ac-macros/misc.m4 @@ -594,22 +594,13 @@ AC_MSG_RESULT($ac_cv_conv_longlong_to_float) ]) AC_DEFUN([MYSQL_CHECK_VIO], [ - AC_ARG_WITH([vio], - [ --with-vio Include the Virtual IO support], - [vio="$withval"], - [vio=no]) - - if test "$vio" = "yes" - then - vio_dir="vio" - vio_libs="../vio/libvio.la" - AC_DEFINE(HAVE_VIO, 1) - else - vio_dir="" - vio_libs="" - fi - AC_SUBST([vio_dir]) - AC_SUBST([vio_libs]) +dnl +dnl we always use vio: no need for special defines +dnl + AC_DEFINE([HAVE_VIO_READ_BUFF], [1], + [Define to enable buffered read. This works only if syscalls + read/recv return as soon as there is some data in the kernel + buffer, no matter how big the given buffer is.]) ]) # Local version of _AC_PROG_CXX_EXIT_DECLARATION that does not diff --git a/config/ac-macros/openssl.m4 b/config/ac-macros/openssl.m4 index 9da0e38f2ba..6541a492247 100644 --- a/config/ac-macros/openssl.m4 +++ b/config/ac-macros/openssl.m4 @@ -89,9 +89,6 @@ AC_MSG_CHECKING(for OpenSSL) fi MYSQL_FIND_OPENSSL([$openssl_includes], [$openssl_libs]) #force VIO use - vio_dir="vio" - vio_libs="../vio/libvio.la" - AC_DEFINE([HAVE_VIO], [1], [Virtual IO]) AC_MSG_RESULT(yes) openssl_libs="-L$OPENSSL_LIB -lssl -lcrypto" # Don't set openssl_includes to /usr/include as this gives us a lot of |