summaryrefslogtreecommitdiff
path: root/acinclude.m4
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-04-02 17:54:57 +0300
committerunknown <monty@hundin.mysql.fi>2002-04-02 17:54:57 +0300
commitc95270b8c4b320c1080acc03da99e2a33c80440b (patch)
tree0918e7f417ac64ab19af6ea441c12c97e897c1b9 /acinclude.m4
parent546b6a679ff5f42e5ee5433982a2fb4daa256344 (diff)
downloadmariadb-git-c95270b8c4b320c1080acc03da99e2a33c80440b.tar.gz
Cleanups
Don't use DBUG library for struct st_my_thread_var to make code less complicated. Docs/manual.texi: Cleanup acinclude.m4: Search after openssl in /usr/local client/mysql.cc: Fix prompt client/mysqladmin.c: Cleanup client/mysqltest.c: Cleanup include/my_pthread.h: Move thread variables to the right location include/my_sys.h: Move thread variables to the right location include/mysql.h: Clean up client prototypes libmysql/libmysql.c: Clean up client prototypes mysys/my_static.h: Cleanup mysys/my_thr_init.c: Don't use DBUG library for struct st_my_thread_var to make code less complicated sql/item_cmpfunc.cc: Small optimization sql/net_pkg.cc: Cleanup sql/sql_parse.cc: Allow VARCHAR(0)
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m44
1 files changed, 2 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 85149d64dc7..9c5fbfbbb78 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -703,14 +703,14 @@ AC_DEFUN(MYSQL_CHECK_VIO, [
AC_DEFUN(MYSQL_FIND_OPENSSL, [
for d in /usr/ssl/include /usr/local/ssl/include /usr/include/openssl \
/usr/include/ssl /opt/ssl/include /opt/openssl/include \
-/usr/local/ssl/include/openssl ; do
+/usr/local/ssl/include/openssl /usr/local/include/openssl ; do
if test -f $d/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 ; do
+/usr/lib /opt/ssl/lib /opt/openssl/lib /usr/local/lib/ ; do
if test -f $d/libssl.a ; then
OPENSSL_LIB=$d
fi