diff options
| author | unknown <monty@mashka.(none)> | 2003-07-18 12:35:29 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.(none)> | 2003-07-18 12:35:29 +0300 |
| commit | dbc5a1f8fc477b385be573a7734a6e4a010afa75 (patch) | |
| tree | fbb389b97907db15711eaf904125dbc03d8ab554 /acinclude.m4 | |
| parent | 4fa18bba64597e19895128bcd05fd2c0a34e0f99 (diff) | |
| download | mariadb-git-dbc5a1f8fc477b385be573a7734a6e4a010afa75.tar.gz | |
Portability fixes for Redhat 9mysql-4.0.14
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
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index f7d89ecf35a..3bee4e7a874 100644 --- a/acinclude.m4 +++ b/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) |