diff options
| author | monty@hundin.mysql.fi <> | 2002-10-16 19:05:10 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-10-16 19:05:10 +0300 |
| commit | a54df74af0e7367261bcd2f45254e84a3e355946 (patch) | |
| tree | 66490ad10c369a5769b1adb2c70bad7536a903b3 /acinclude.m4 | |
| parent | 26b1bbdbd1f630c68025a5b5ac565067ef1747dc (diff) | |
| download | mariadb-git-a54df74af0e7367261bcd2f45254e84a3e355946.tar.gz | |
Fixes after last merge.
Ignore changed keyblocks when on does DELETE FROM table_name;
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 76953e3e4c2..b91c6905538 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -746,7 +746,12 @@ AC_MSG_CHECKING(for OpenSSL) AC_DEFINE(HAVE_VIO) AC_MSG_RESULT(yes) openssl_libs="-L$OPENSSL_LIB -lssl -lcrypto" - openssl_includes="-I$OPENSSL_INCLUDE" + # 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" + then + openssl_includes="-I$OPENSSL_INCLUDE" + fi AC_DEFINE(HAVE_OPENSSL) # openssl-devel-0.9.6 requires dlopen() and we can't link staticly |