diff options
| author | monty@mashka.mysql.fi <> | 2002-09-05 16:17:08 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-09-05 16:17:08 +0300 |
| commit | 0281a6b16026299bebebb58af1b88c2d741b57f6 (patch) | |
| tree | 103a1aadee6000a5d09b0ba7c1de75797fb958fa /acinclude.m4 | |
| parent | 1a0e3423e6a311a8af79829b6a6088a909f1e320 (diff) | |
| download | mariadb-git-0281a6b16026299bebebb58af1b88c2d741b57f6.tar.gz | |
Fixed searching after ssl directories.
Fixed that GRANT ... REQUIRE options are not forgot when doing new GRANT
Changed fn_ext to point at first '.' after directory.
FLUSH LOGS removed numerical extension for all future update logs.
Fixed the mysqld --help reports right values for --datadir and --bind-address
--log-binary=a.b.c now properly strips of .b.c
Fix that one can DROP UDF functions that was not loaded at startup
Made AND optional in REQUIRE
Added REQUIRE NONE
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 2b6c8cbc390..488d35c1268 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -701,13 +701,13 @@ AC_DEFUN(MYSQL_CHECK_VIO, [ ]) AC_DEFUN(MYSQL_FIND_OPENSSL, [ - for d in /usr/ssl/include /usr/local/ssl/include /usr/include/openssl \ + for d in /usr/ssl/include /usr/local/ssl/include /usr/include \ /usr/include/ssl /opt/ssl/include /opt/openssl/include \ -/usr/local/ssl/include/openssl /usr/local/include/openssl ; do - if test -f $d/ssl.h ; then - OPENSSL_INCLUDE=$d - fi - done +/usr/local/ssl/include /usr/local/include ; do + if test -f $d/openssl/ssl.h ; then + OPENSSL_INCLUDE=$d + fi + done for d in /usr/ssl/lib /usr/local/ssl/lib /usr/lib/openssl \ /usr/lib /opt/ssl/lib /opt/openssl/lib /usr/local/lib/ ; do |