Commit 16bb1418 authored by unknown's avatar unknown

Portability fixes for Redhat 9


acinclude.m4:
  Fixed problem with openssl on RedHat 9
vio/viosocket.c:
  Removed compiler warning
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
parent 995fe9f1
...@@ -56,6 +56,7 @@ monty@bitch.mysql.fi ...@@ -56,6 +56,7 @@ monty@bitch.mysql.fi
monty@butch. monty@butch.
monty@donna.mysql.fi monty@donna.mysql.fi
monty@hundin.mysql.fi monty@hundin.mysql.fi
monty@mashka.(none)
monty@mashka.mysql.fi monty@mashka.mysql.fi
monty@narttu. monty@narttu.
monty@narttu.mysql.fi monty@narttu.mysql.fi
......
...@@ -713,7 +713,7 @@ AC_DEFUN(MYSQL_FIND_OPENSSL, [ ...@@ -713,7 +713,7 @@ AC_DEFUN(MYSQL_FIND_OPENSSL, [
/usr/include/ssl /opt/ssl/include /opt/openssl/include \ /usr/include/ssl /opt/ssl/include /opt/openssl/include \
/usr/local/ssl/include /usr/local/include ; do /usr/local/ssl/include /usr/local/include ; do
if test -f $d/openssl/ssl.h ; then if test -f $d/openssl/ssl.h ; then
OPENSSL_INCLUDE=$d OPENSSL_INCLUDE=-I$d
fi fi
done done
...@@ -724,6 +724,15 @@ AC_DEFUN(MYSQL_FIND_OPENSSL, [ ...@@ -724,6 +724,15 @@ AC_DEFUN(MYSQL_FIND_OPENSSL, [
fi fi
done 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 if test -z "$OPENSSL_LIB" -o -z "$OPENSSL_INCLUDE" ; then
echo "Could not find an installation of OpenSSL" echo "Could not find an installation of OpenSSL"
if test -n "$OPENSSL_LIB" ; then if test -n "$OPENSSL_LIB" ; then
...@@ -756,9 +765,9 @@ AC_MSG_CHECKING(for OpenSSL) ...@@ -756,9 +765,9 @@ AC_MSG_CHECKING(for OpenSSL)
openssl_libs="-L$OPENSSL_LIB -lssl -lcrypto" openssl_libs="-L$OPENSSL_LIB -lssl -lcrypto"
# Don't set openssl_includes to /usr/include as this gives us a lot of # Don't set openssl_includes to /usr/include as this gives us a lot of
# compiler warnings when using gcc 3.x # compiler warnings when using gcc 3.x
if test "$OPENSSL_INCLUDE" != "/usr/include" if test "$OPENSSL_INCLUDE" != "-I/usr/include"
then then
openssl_includes="-I$OPENSSL_INCLUDE" openssl_includes="$OPENSSL_INCLUDE"
fi fi
AC_DEFINE(HAVE_OPENSSL) AC_DEFINE(HAVE_OPENSSL)
......
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
#include <mysql_com.h> #include <mysql_com.h>
#include <errno.h> #include <errno.h>
#include <violite.h>
#include <my_sys.h> #include <my_sys.h>
#include <violite.h>
#include <my_net.h> #include <my_net.h>
#include <m_string.h> #include <m_string.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment