summaryrefslogtreecommitdiff
path: root/libmysqld/examples/Makefile.am
diff options
context:
space:
mode:
authorJon Olav Hauglid <jon.hauglid@sun.com>2010-04-20 10:51:50 +0200
committerJon Olav Hauglid <jon.hauglid@sun.com>2010-04-20 10:51:50 +0200
commitac7873663866e74fb7572c0b2a5f2548a2897420 (patch)
tree3c10718d95da445db1e1f9405aa01297659a8739 /libmysqld/examples/Makefile.am
parentafdf0f030c342e28c5cfd7220e55830b18424de3 (diff)
parent1a3c03dbb49cfc9ae8246957c5b0ac2a9389d28e (diff)
downloadmariadb-git-ac7873663866e74fb7572c0b2a5f2548a2897420.tar.gz
merge from mysql-trunk-bugfixing
Diffstat (limited to 'libmysqld/examples/Makefile.am')
-rw-r--r--libmysqld/examples/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am
index 109d33a85ae..abae608550e 100644
--- a/libmysqld/examples/Makefile.am
+++ b/libmysqld/examples/Makefile.am
@@ -32,7 +32,7 @@ link_sources:
done
echo timestamp > link_sources
-DEFS = -DEMBEDDED_LIBRARY
+DEFS = -DEMBEDDED_LIBRARY @DEFS@
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir) \
-I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \
$(openssl_includes)