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 /libmysql_r | |
| 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 'libmysql_r')
| -rw-r--r-- | libmysql_r/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am index b75f65b6f78..5329c2cf18f 100644 --- a/libmysql_r/Makefile.am +++ b/libmysql_r/Makefile.am @@ -21,7 +21,8 @@ target = libmysqlclient_r.la target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@ LIBS = @LIBS@ @openssl_libs@ -INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include $(openssl_includes) +INCLUDES = @MT_INCLUDES@ \ + -I$(top_srcdir)/include $(openssl_includes) @ZLIB_INCLUDES@ ## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include include $(top_srcdir)/libmysql/Makefile.shared |