mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 02:05:57 +01:00
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
This commit is contained in:
parent
995fe9f13a
commit
16bb14180b
3 changed files with 14 additions and 4 deletions
|
@ -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
|
||||
|
|
15
acinclude.m4
15
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)
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue