diff options
| author | unknown <monty@mashka.(none)> | 2003-07-18 12:38:18 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.(none)> | 2003-07-18 12:38:18 +0300 |
| commit | 906dc7df753ea5107957c7470f43405f92a71ed0 (patch) | |
| tree | 674cafe1d3db8a9e1b034442b3b3feca61b0e704 | |
| parent | 42346bf9d10bb052c7d0d6613818ea1e6e4753c8 (diff) | |
| parent | 16bb14180bfd3dd6067b7e7969fb5d34cc8e3e94 (diff) | |
| download | mariadb-git-906dc7df753ea5107957c7470f43405f92a71ed0.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.(none):/home/my/mysql-4.0
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | acinclude.m4 | 15 | ||||
| -rw-r--r-- | vio/viosocket.c | 2 |
3 files changed, 14 insertions, 4 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index b70b0a7b381..e6124b4111e 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -56,6 +56,7 @@ monty@bitch.mysql.fi monty@butch. monty@donna.mysql.fi monty@hundin.mysql.fi +monty@mashka.(none) monty@mashka.mysql.fi monty@narttu. monty@narttu.mysql.fi diff --git a/acinclude.m4 b/acinclude.m4 index f7d89ecf35a..3bee4e7a874 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -713,7 +713,7 @@ AC_DEFUN(MYSQL_FIND_OPENSSL, [ /usr/include/ssl /opt/ssl/include /opt/openssl/include \ /usr/local/ssl/include /usr/local/include ; do if test -f $d/openssl/ssl.h ; then - OPENSSL_INCLUDE=$d + OPENSSL_INCLUDE=-I$d fi done @@ -724,6 +724,15 @@ AC_DEFUN(MYSQL_FIND_OPENSSL, [ fi done + # On RedHat 9 we need kerberos to compile openssl + for d in /usr/kerberos/include + do + if test -f $d/krb5.h ; then + OPENSSL_INCLUDE="$OPENSSL_INCLUDE -I$d" + fi + done + + if test -z "$OPENSSL_LIB" -o -z "$OPENSSL_INCLUDE" ; then echo "Could not find an installation of OpenSSL" if test -n "$OPENSSL_LIB" ; then @@ -756,9 +765,9 @@ AC_MSG_CHECKING(for OpenSSL) openssl_libs="-L$OPENSSL_LIB -lssl -lcrypto" # Don't set openssl_includes to /usr/include as this gives us a lot of # compiler warnings when using gcc 3.x - if test "$OPENSSL_INCLUDE" != "/usr/include" + if test "$OPENSSL_INCLUDE" != "-I/usr/include" then - openssl_includes="-I$OPENSSL_INCLUDE" + openssl_includes="$OPENSSL_INCLUDE" fi AC_DEFINE(HAVE_OPENSSL) diff --git a/vio/viosocket.c b/vio/viosocket.c index 898b9a96c11..6f5c4142a45 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -26,8 +26,8 @@ #include <mysql_com.h> #include <errno.h> -#include <violite.h> #include <my_sys.h> +#include <violite.h> #include <my_net.h> #include <m_string.h> |