diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-05-30 22:15:13 +0200 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-05-30 22:15:13 +0200 |
| commit | 762c1fe917eb2be88a1504b83819563966c59294 (patch) | |
| tree | 752f6d09aa79cad978614d06d7b7d5e0b0fbafb5 /sql/Makefile.am | |
| parent | b3da513091f0a09e7e045bb9e35ecde1b06f3ed5 (diff) | |
| parent | e65fdda8b1a188442cf5547dba18c69a0cecf1b5 (diff) | |
| download | mariadb-git-762c1fe917eb2be88a1504b83819563966c59294.tar.gz | |
Merge mysql.com:/home/kent/bk/tmp3/mysql-4.1-build
into mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
configure.in:
Auto merged
Diffstat (limited to 'sql/Makefile.am')
| -rw-r--r-- | sql/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index 9be3bf93746..fae35222128 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -43,7 +43,8 @@ mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \ @innodb_system_libs@ \ @ndbcluster_libs@ @ndbcluster_system_libs@ \ $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \ - $(yassl_libs) $(openssl_libs) + $(yassl_libs) $(openssl_libs) \ + @MYSQLD_EXTRA_LIBS@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ item_strfunc.h item_timefunc.h item_uniq.h \ |