diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-02-07 15:11:03 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-02-07 15:11:03 +0100 |
| commit | 780e60af03400f604297df36de2080b1574cd22b (patch) | |
| tree | b18bd302ee5ea141f6d59e426eaf44f5d653779e /sql | |
| parent | b3d96f79727c597404bb559fc6d43c2577c52005 (diff) | |
| download | mariadb-git-780e60af03400f604297df36de2080b1574cd22b.tar.gz | |
Avoid problem with "noinst_HEADERS" being sucked into "mysqld_LDADD" if openssl_libs and yassl_libs are empty strings
Diffstat (limited to 'sql')
| -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 20c4527185b..1ac8602ebdf 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) + noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ item_strfunc.h item_timefunc.h item_uniq.h \ item_create.h item_subselect.h item_row.h \ |