summaryrefslogtreecommitdiff
path: root/libmysql_r
diff options
context:
space:
mode:
authorunknown <tonu@x153.internalnet>2001-07-24 14:07:46 +0800
committerunknown <tonu@x153.internalnet>2001-07-24 14:07:46 +0800
commit2ec8dce13dc2357179244e73e97648034b7cc5a6 (patch)
treeed5f3121d49f4cd731f353d0ff4b0684837cc5b5 /libmysql_r
parentce77251db69e1becb2716632e8dbbc3b99391406 (diff)
downloadmariadb-git-2ec8dce13dc2357179244e73e97648034b7cc5a6.tar.gz
OpenSSL fixes. Should not affect anything else.
Makefile.am: Moved bio dir into server_dirs in acinclude.in client/Makefile.am: We need OpenSSL includes here include/global.h: Workaround for OPENSSL librar bug with defining crypt() include/violite.h: small fixes libmysql/Makefile.am: We need OpenSSL includes here libmysql/Makefile.shared: Yes, we need to compile more programs whtn --with-openssl is used libmysql/libmysql.c: Make it work! (openssl) libmysql_r/Makefile.am: We need OpenSSL includes here sql/mysqld.cc: Memory was not freed before sql/sql_parse.cc: fix vio/Makefile.am: Added testprogram compilation and openssl libraries linking vio/viossl.c: Cleanups, fixes, etc... vio/viosslfactories.c: Copyright was missing. Fixed renamed macros for newer OpenSSL vio/viotest-ssl.c: Made testprogram work again BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
Diffstat (limited to 'libmysql_r')
-rw-r--r--libmysql_r/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am
index 110e26797bd..154c3df431b 100644
--- a/libmysql_r/Makefile.am
+++ b/libmysql_r/Makefile.am
@@ -22,7 +22,7 @@ target_defs =
## LIBS = @LIBS@
INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include \
- -I$(srcdir)/.. -I$(top_srcdir) -I..
+ -I$(srcdir)/.. -I$(top_srcdir) -I.. $(openssl_includes)
## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include
include $(top_srcdir)/libmysql/Makefile.shared