diff options
| author | konstantin@mysql.com <> | 2004-07-24 03:30:11 -0700 |
|---|---|---|
| committer | konstantin@mysql.com <> | 2004-07-24 03:30:11 -0700 |
| commit | 569d3c848884b09f30ec0e8ef8bafb73aa167e3e (patch) | |
| tree | 35c5c62bc54e061c8e7e29c5b464024e78b3408d /tools | |
| parent | cd5ed13e4d32b55ab4ddad6a8f6d7ab082504dd8 (diff) | |
| download | mariadb-git-569d3c848884b09f30ec0e8ef8bafb73aa167e3e.tar.gz | |
WL#1518, "make bundled zlib usable for unix builds":
required autotools macro written and deployed in all apropriate Makefile.ams.
Use cases checked:
- linux, standard location of zlib, no ndb
- linux, standard locatoin of zlib, with ndb
- linux, non-standard location of zlib, no ndb
- hpux11, use of bundled zlib, no ndb
The only non-checked case is non-standard location of zlib (or use of bundled
zlib) + ndb. I wasn't able to check it as ndb/ just won't compile on beasts
like AIX52 or HPUX11, where such a check is possible. It didn't compile
there before as these systems dont't have installed zlib, so nothing got broken ;)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 0dc0b90c60e..50d1c8af56a 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,5 +1,23 @@ -INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include $(openssl_includes) -LDADD= @CLIENT_EXTRA_LDFLAGS@ ../libmysql_r/libmysqlclient_r.la @openssl_libs@ +# Copyright (C) 2004 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# 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) +LDADD= @CLIENT_EXTRA_LDFLAGS@ @openssl_libs@ @ZLIB_LIBS@ \ + $(top_builddir)/libmysql_r/libmysqlclient_r.la \ bin_PROGRAMS= mysqlmanager mysqlmanager_SOURCES= mysqlmanager.c mysqlmanager_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) |