diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-02-07 15:11:19 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-02-07 15:11:19 +0100 |
| commit | 094db7029ea92e7dc6c0731e5e6f19285f415536 (patch) | |
| tree | 03914a1c2b0d1256bbcd81af306f06313e2423ba /sql/Makefile.am | |
| parent | 7c152303c62b4d812552e3dc476f6ada5a307cc4 (diff) | |
| parent | 780e60af03400f604297df36de2080b1574cd22b (diff) | |
| download | mariadb-git-094db7029ea92e7dc6c0731e5e6f19285f415536.tar.gz | |
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
into pilot.mysql.com:/home/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, 2 insertions, 1 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index 264b469cd8c..43331e3d0c9 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -40,7 +40,8 @@ mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \ @pstack_libs@ \ @mysql_plugin_libs@ \ $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \ - @yassl_libs@ @openssl_libs@ + $(yassl_libs) $(openssl_libs) + noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ item_strfunc.h item_timefunc.h \ item_xmlfunc.h \ |