diff options
author | monty@hundin.mysql.fi <> | 2001-09-22 17:40:57 +0300 |
---|---|---|
committer | monty@hundin.mysql.fi <> | 2001-09-22 17:40:57 +0300 |
commit | e390a995737f136c594a7c792caa12061690800f (patch) | |
tree | 23349a84d09c518565222da27e0607b42d415f18 /acinclude.m4 | |
parent | b0953cfa86881af7aa330adc687bbf1b1a488524 (diff) | |
download | mariadb-git-e390a995737f136c594a7c792caa12061690800f.tar.gz |
Added support of INSERT to MERGE tables
Fixes for embedded libary and openssl
Diffstat (limited to 'acinclude.m4')
-rw-r--r-- | acinclude.m4 | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index ca711a7c641..d7e492856bb 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -690,8 +690,7 @@ fi AC_DEFUN(MYSQL_CHECK_VIO, [ AC_ARG_WITH([vio], - [\ - --with-vio Include the Virtual IO support], + [ --with-vio Include the Virtual IO support], [vio="$withval"], [vio=no]) @@ -712,8 +711,7 @@ AC_DEFUN(MYSQL_CHECK_VIO, [ AC_DEFUN(MYSQL_CHECK_OPENSSL, [ AC_MSG_CHECKING(for OpenSSL) AC_ARG_WITH([openssl], - [\ - --with-openssl Include the OpenSSL support], + [ --with-openssl Include the OpenSSL support], [openssl="$withval"], [openssl=no]) @@ -722,7 +720,7 @@ AC_MSG_CHECKING(for OpenSSL) if test -n "$vio_dir" then AC_MSG_RESULT(yes) - openssl_libs="-lssl -lcrypto -L/usr/local/ssl/lib" + openssl_libs="-L/usr/local/ssl/lib -lssl -lcrypto" openssl_includes="-I/usr/local/ssl/include" else AC_MSG_ERROR([OpenSSL requires Virtual IO support (--with-vio)]) |