diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-10-28 11:45:30 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-10-28 11:45:30 +0200 |
| commit | 92f698f9f0eeac0d95442248e1581370493201b5 (patch) | |
| tree | 1376a3d4a74cd08e15f83cede09c69c5ec9fec94 /sql/Makefile.am | |
| parent | 268eb66421971a5eb4581abe3c51ca4b8f4fd385 (diff) | |
| parent | 2533dd084403235c5f36590a1b8106761ff989b7 (diff) | |
| download | mariadb-git-92f698f9f0eeac0d95442248e1581370493201b5.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
config/ac-macros/yassl.m4:
Auto merged
configure.in:
Auto merged
libmysqld/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
extra/yassl/taocrypt/src/Makefile.am:
Manual merge
Diffstat (limited to 'sql/Makefile.am')
| -rw-r--r-- | sql/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index cd1de0ce3c9..2450f18c970 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -22,7 +22,8 @@ MYSQLBASEdir= $(prefix) INCLUDES = @ZLIB_INCLUDES@ \ @bdb_includes@ @innodb_includes@ @ndbcluster_includes@ \ -I$(top_builddir)/include -I$(top_srcdir)/include \ - -I$(top_srcdir)/regex -I$(srcdir) $(openssl_includes) + -I$(top_srcdir)/regex -I$(srcdir) $(yassl_includes) \ + $(openssl_includes) WRAPLIBS= @WRAPLIBS@ SUBDIRS = share libexec_PROGRAMS = mysqld @@ -42,7 +43,8 @@ mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \ @bdb_libs@ @innodb_libs@ @pstack_libs@ \ @innodb_system_libs@ \ @ndbcluster_libs@ @ndbcluster_system_libs@ \ - $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@ + $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \ + @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 \ |