Merge bk-internal.mysql.com:/home/bk/mysql-4.0

into mashka.(none):/home/my/mysql-4.0

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

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)
 

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>