Fix: remove compile warnings on RH(with openssl)

parent 33c47c7e
...@@ -745,7 +745,7 @@ AC_DEFUN(MYSQL_FIND_OPENSSL, [ ...@@ -745,7 +745,7 @@ AC_DEFUN(MYSQL_FIND_OPENSSL, [
for d in /usr/kerberos/include for d in /usr/kerberos/include
do do
if test -f $d/krb5.h ; then if test -f $d/krb5.h ; then
OPENSSL_INCLUDE="$OPENSSL_INCLUDE -I$d" OPENSSL_KERBEROS_INCLUDE="$d"
fi fi
done done
...@@ -794,10 +794,15 @@ AC_MSG_CHECKING(for OpenSSL) ...@@ -794,10 +794,15 @@ 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
openssl_includes=""
if test "$OPENSSL_INCLUDE" != "-I/usr/include" if test "$OPENSSL_INCLUDE" != "-I/usr/include"
then then
openssl_includes="$OPENSSL_INCLUDE" openssl_includes="$OPENSSL_INCLUDE"
fi fi
if test "$OPENSSL_KERBEROS_INCLUDE"
then
openssl_includes="$openssl_includes -I$OPENSSL_KERBEROS_INCLUDE"
fi
AC_DEFINE(HAVE_OPENSSL) AC_DEFINE(HAVE_OPENSSL)
# openssl-devel-0.9.6 requires dlopen() and we can't link staticly # openssl-devel-0.9.6 requires dlopen() and we can't link staticly
......
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