diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-09-28 07:28:05 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-09-28 07:28:05 +0300 |
| commit | c21867da8c98c6245383eab4f37862f3adc2c626 (patch) | |
| tree | 5cdccafdfa54f95c7cc040d8d171312a572c5e9c /acinclude.m4 | |
| parent | 1a57e278c2bf3b93d218cb0f610ba5d3a74e8968 (diff) | |
| parent | cf350ce984ac75ef27d5750af2a11cc9704af7e9 (diff) | |
| download | mariadb-git-c21867da8c98c6245383eab4f37862f3adc2c626.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
acinclude.m4:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Docs/manual.texi:
Auto merged
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index dde1eaeb869..5b216a06df5 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 not 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,19 @@ dnl Call MYSQL_CHECK_ORBIT even if mysqlfs == no, so that @orbit_*@ dnl get substituted. MYSQL_CHECK_ORBIT + AC_MSG_CHECKING(if we should build MySQLFS) + fs_dirs="" if test "$mysqlfs" = "yes" then if test -n "$orbit_exec_prefix" then fs_dirs=fs + AC_MSG_RESULT([yes]) else - AC_MSG_ERROR([mysqlfs requires ORBit, the CORBA ORB]) + AC_MSG_RESULT(disabled because ORBIT, the CORBA ORB, was not found) fi else - fs_dirs= + AC_MSG_RESULT([no]) fi AC_SUBST([fs_dirs]) ]) |