diff options
| author | unknown <msvensson@pilot.(none)> | 2007-06-28 11:18:58 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-06-28 11:18:58 +0200 |
| commit | f26196290eeb9fa20bd0e5e8bcde28400cd244e8 (patch) | |
| tree | 2df446c7b9a2b2c47fdb4b718fc580d7552628cb /sql/Makefile.am | |
| parent | db693e4143e6d03a71aaedc641462f98fc7e8ce7 (diff) | |
| parent | b98c96e6a11fae7a2e3e96fb112dff6dead5f27a (diff) | |
| download | mariadb-git-f26196290eeb9fa20bd0e5e8bcde28400cd244e8.tar.gz | |
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
sql/Makefile.am:
Auto merged
Diffstat (limited to 'sql/Makefile.am')
| -rw-r--r-- | sql/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index a379a950c41..073f9a8d479 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -38,8 +38,7 @@ mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \ @pstack_libs@ \ @mysql_plugin_libs@ \ $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \ - $(yassl_libs) $(openssl_libs) \ - @MYSQLD_EXTRA_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 \ |