diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-08-07 20:42:26 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-08-07 20:42:26 +0300 |
| commit | 553daa5e40b413489431d5d21b512c6b529bccac (patch) | |
| tree | 5915edc465056c2f511cea76fabcb2e7a6cd7910 /acinclude.m4 | |
| parent | 46a2d8a2f6dd4f0168e09abffb5527c8be2d4a93 (diff) | |
| download | mariadb-git-553daa5e40b413489431d5d21b512c6b529bccac.tar.gz | |
Fix that -integer works as in 4.0
acinclude.m4:
Fix for RedHat9 and openssl
sql/item_func.cc:
Indentation changes
Fix that -integer works as in 4.0
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 94e70f2b892..2b91d52d749 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -746,7 +746,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 @@ -757,6 +757,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 @@ -789,9 +798,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) |