diff options
| author | unknown <joreland@mysql.com> | 2004-12-16 22:22:18 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-12-16 22:22:18 +0100 |
| commit | 8e24d09a146037981a7a4cbbaab17f76bfe33919 (patch) | |
| tree | 62dc9c01dc8ccf0ded747be964ba8a4bdd75f23e /tools | |
| parent | c0564421a239818948061933f82c2592ccf3947d (diff) | |
| parent | f9b1e2de19862a18fcd7b1ba75252be43d6ed04a (diff) | |
| download | mariadb-git-8e24d09a146037981a7a4cbbaab17f76bfe33919.tar.gz | |
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 5528df4dd68..55801c22c48 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -15,7 +15,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Process this file with automake to create Makefile.in -INCLUDES=@MT_INCLUDES@ -I$(top_srcdir)/include $(openssl_includes) +INCLUDES=@MT_INCLUDES@ -I$(top_srcdir)/include $(openssl_includes) \ + -I$(top_srcdir)/extra LDADD= @CLIENT_EXTRA_LDFLAGS@ @openssl_libs@ \ $(top_builddir)/libmysql_r/libmysqlclient_r.la @ZLIB_LIBS@ bin_PROGRAMS= mysqlmanager |