diff options
| author | msvensson@neptunus.(none) <> | 2005-10-28 11:45:30 +0200 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2005-10-28 11:45:30 +0200 |
| commit | 68fa03258a1f8a4bceb930d1ebfb722770db4054 (patch) | |
| tree | 1376a3d4a74cd08e15f83cede09c69c5ec9fec94 /libmysqld | |
| parent | b1189769c90ff9d3070df8c5affba74121490035 (diff) | |
| parent | bb571de36845ebabfb1880ab823b346b54362fe3 (diff) | |
| download | mariadb-git-68fa03258a1f8a4bceb930d1ebfb722770db4054.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 943b75f9973..691bf0cd99f 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -29,7 +29,7 @@ INCLUDES= @bdb_includes@ \ -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/sql -I$(top_srcdir)/sql/examples \ -I$(top_srcdir)/regex \ - $(openssl_includes) @ZLIB_INCLUDES@ + $(openssl_includes) $(yassl_includes) @ZLIB_INCLUDES@ noinst_LIBRARIES = libmysqld_int.a pkglib_LIBRARIES = libmysqld.a @@ -80,7 +80,9 @@ INC_LIB= $(top_builddir)/regex/libregex.a \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/strings/libmystrings.a \ $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/vio/libvio.a + $(top_builddir)/vio/libvio.a \ + @yassl_libs_with_path@ + # # To make it easy for the end user to use the embedded library we |