diff options
| author | monty@tik.mysql.fi <> | 2001-09-27 21:45:48 +0300 |
|---|---|---|
| committer | monty@tik.mysql.fi <> | 2001-09-27 21:45:48 +0300 |
| commit | e05bf277d6529b61bf74cf0b8b3e6efd994869a0 (patch) | |
| tree | bacb3c051e2ae3debd9dedea9b0eb2efd094a961 /acinclude.m4 | |
| parent | 5d9be4de24ab02436edbe2c75e96704a31c522b2 (diff) | |
| download | mariadb-git-e05bf277d6529b61bf74cf0b8b3e6efd994869a0.tar.gz | |
Final fixes for INSERT into MERGE tables.
Move MAX_BLOB_WIDTH to be global
Added full support for unsigned BIGINT
Fixed spelling errors
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index d7e492856bb..8a7413b9b08 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -715,6 +715,8 @@ AC_MSG_CHECKING(for OpenSSL) [openssl="$withval"], [openssl=no]) + openssl_libs="" + openssl_includes="" if test "$openssl" = "yes" then if test -n "$vio_dir" @@ -722,14 +724,12 @@ AC_MSG_CHECKING(for OpenSSL) AC_MSG_RESULT(yes) openssl_libs="-L/usr/local/ssl/lib -lssl -lcrypto" openssl_includes="-I/usr/local/ssl/include" + AC_DEFINE(HAVE_OPENSSL) else - AC_MSG_ERROR([OpenSSL requires Virtual IO support (--with-vio)]) + AC_MSG_RESULT("disabled because --with-vio wasn't used") fi - AC_DEFINE(HAVE_OPENSSL) else AC_MSG_RESULT(no) - openssl_libs="" - openssl_includes="" fi NON_THREADED_CLIENT_LIBS="$NON_THREADED_CLIENT_LIBS $openssl_libs" AC_SUBST(openssl_libs) @@ -748,16 +748,15 @@ dnl Call MYSQL_CHECK_ORBIT even if mysqlfs == no, so that @orbit_*@ dnl get substituted. MYSQL_CHECK_ORBIT + fs_dirs="" if test "$mysqlfs" = "yes" then if test -n "$orbit_exec_prefix" then fs_dirs=fs else - AC_MSG_ERROR([mysqlfs requires ORBit, the CORBA ORB]) + AC_MSG_RESULT("disabled because ORBIT, the CORBA ORB, wasn't found"]) fi - else - fs_dirs= fi AC_SUBST([fs_dirs]) ]) |