diff options
| author | msvensson@pilot.(none) <> | 2007-06-28 11:18:58 +0200 |
|---|---|---|
| committer | msvensson@pilot.(none) <> | 2007-06-28 11:18:58 +0200 |
| commit | a7ddf48fedf9856fb951ff3d92e1e1a9f9521191 (patch) | |
| tree | 2df446c7b9a2b2c47fdb4b718fc580d7552628cb /sql/Makefile.am | |
| parent | 119f6cb0002115198631ed1cfb9eb4d21f5002d6 (diff) | |
| parent | 78349b2494fb1f00bfb58e29da776f84d9e52add (diff) | |
| download | mariadb-git-a7ddf48fedf9856fb951ff3d92e1e1a9f9521191.tar.gz | |
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
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 \ |