summaryrefslogtreecommitdiff
path: root/sql/Makefile.am
diff options
context:
space:
mode:
authorjoerg@debian.(none) <>2007-06-01 12:59:06 +0200
committerjoerg@debian.(none) <>2007-06-01 12:59:06 +0200
commit81930fc4bf9163b334eec9707fc51127c4d5c718 (patch)
tree7adaf5bb5a13afeea9ec41f2b590b5271e32e42a /sql/Makefile.am
parent2c8f4f97910bec416fc9a375cf1c74be2ca395cc (diff)
parent509faa5a3b1bc271b928249795a76ebf74ff4f52 (diff)
downloadmariadb-git-81930fc4bf9163b334eec9707fc51127c4d5c718.tar.gz
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1
into debian.(none):/M51/merge-5.1
Diffstat (limited to 'sql/Makefile.am')
-rw-r--r--sql/Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am
index d280b22f493..fdf3f88c1f8 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -38,7 +38,8 @@ mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
@pstack_libs@ \
@mysql_plugin_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 \