summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@sun.com>2009-06-17 14:38:41 +0500
committerSergey Vojtovich <svoj@sun.com>2009-06-17 14:38:41 +0500
commit8469eee8c3d46096aa4c258550661b72abd6d873 (patch)
tree3f784cc40a3011ea088711f041ce6f2796c0d79a /storage
parent4e430bb4cf6e67f5950ecf0788ff175238fd3df9 (diff)
downloadmariadb-git-8469eee8c3d46096aa4c258550661b72abd6d873.tar.gz
When using bundled zlib, INNODB_PLUGIN was looking for
zlib headers in wrong location. Fixed by using path exported by zlib.m4 macro. storage/innodb_plugin/Makefile.am: Include zlib headers from a proper location.
Diffstat (limited to 'storage')
-rw-r--r--storage/innodb_plugin/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innodb_plugin/Makefile.am b/storage/innodb_plugin/Makefile.am
index 09e5e89e323..9f593635088 100644
--- a/storage/innodb_plugin/Makefile.am
+++ b/storage/innodb_plugin/Makefile.am
@@ -24,7 +24,7 @@ INCLUDES= -I$(top_srcdir)/include -I$(top_builddir)/include \
-I$(top_srcdir)/regex \
-I$(srcdir)/include \
-I$(top_srcdir)/sql \
- -I$(srcdir)
+ -I$(srcdir) @ZLIB_INCLUDES@
DEFS= @DEFS@