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 /server-tools | |
| 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 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am index b872adca09d..4fa2a0da405 100644 --- a/server-tools/instance-manager/Makefile.am +++ b/server-tools/instance-manager/Makefile.am @@ -15,7 +15,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA INCLUDES= @ZLIB_INCLUDES@ -I$(top_srcdir)/include \ - $(openssl_includes) -I$(top_builddir)/include + @openssl_includes@ @yassl_includes@ -I$(top_builddir)/include DEFS= -DMYSQL_INSTANCE_MANAGER -DMYSQL_SERVER @@ -85,7 +85,7 @@ mysqlmanager_LDADD= liboptions.a \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/strings/libmystrings.a \ $(top_builddir)/dbug/libdbug.a \ - @openssl_libs@ @ZLIB_LIBS@ + @openssl_libs@ @yassl_libs@ @ZLIB_LIBS@ tags: |