database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge

Browse Source 
VC++Files/libmysqld/libmysqld.vcproj:
  Auto merged
VC++Files/mysqldemb/mysqldemb.vcproj:
  Auto merged
VC++Files/mysys/mysys.vcproj:
  Auto merged
VC++Files/sql/mysqld.vcproj:
  Auto merged
VC++Files/storage/bdb/bdb.vcproj:
  Auto merged
VC++Files/storage/innobase/innobase.vcproj:
  Auto merged
config/ac-macros/yassl.m4:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
sql/item.cc:
  Auto merged
This commit is contained in:
unknown
2006-04-04 23:37:44 +02:00
parent af66d20c8e b5ca723613
commit 07302c6007
18 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libmysql/Makefile.am
View File

@ -29,7 +29,11 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
include $(srcdir)/Makefile.shared
libmysqlclient_la_SOURCES = $(target_sources)
libmysqlclient_la_LIBADD = $(target_libadd) $(yassl_libs_with_path)
libmysqlclient_la_LIBADD = $(target_libadd)
if HAVE_YASSL
libmysqlclient_la_LIBADD+= $(top_srcdir)/extra/yassl/src/libyassl.la \
$(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.la
endif
libmysqlclient_la_LDFLAGS = $(target_ldflags)
EXTRA_DIST = Makefile.shared libmysql.def dll.c mytest.c cmakelists.txt
noinst_HEADERS = client_settings.h