summaryrefslogtreecommitdiff
path: root/acinclude.m4
diff options
context:
space:
mode:
authorgluh@gluh.mysql.r18.ru <>2003-07-25 09:25:50 +0500
committergluh@gluh.mysql.r18.ru <>2003-07-25 09:25:50 +0500
commit1dfaccb0164336aa004ea373a67bc8735a290b80 (patch)
tree309f3ed6c09bae6799434337343d979926ff1c16 /acinclude.m4
parent33c47c7eadbb72bb680ff1a7df9302030e14e882 (diff)
downloadmariadb-git-1dfaccb0164336aa004ea373a67bc8735a290b80.tar.gz
Fix: remove compile warnings on RH(with openssl)
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m47
1 files changed, 6 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 6ca600d29f3..b558e952543 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -745,7 +745,7 @@ AC_DEFUN(MYSQL_FIND_OPENSSL, [
for d in /usr/kerberos/include
do
if test -f $d/krb5.h ; then
- OPENSSL_INCLUDE="$OPENSSL_INCLUDE -I$d"
+ OPENSSL_KERBEROS_INCLUDE="$d"
fi
done
@@ -794,10 +794,15 @@ 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
+ openssl_includes=""
if test "$OPENSSL_INCLUDE" != "-I/usr/include"
then
openssl_includes="$OPENSSL_INCLUDE"
fi
+ if test "$OPENSSL_KERBEROS_INCLUDE"
+ then
+ openssl_includes="$openssl_includes -I$OPENSSL_KERBEROS_INCLUDE"
+ fi
AC_DEFINE(HAVE_OPENSSL)
# openssl-devel-0.9.6 requires dlopen() and we can't link staticly