From 6b42f932d6d01d8ed8a67a82da177e3a35dce66e Mon Sep 17 00:00:00 2001
From: "hf@deer.(none)" <>
Date: Mon, 15 Mar 2004 16:51:05 +0400
Subject: [PATCH] WL#1163	(to make spatial parts optional)
 --without-geometry and --with-embedded-privilege-control switches added to
 the configure

---
 configure.in        | 25 +++++++++++++++++++++++++
 include/my_global.h |  6 ++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 1c22cb7af08..747421509f5 100644
--- a/configure.in
+++ b/configure.in
@@ -2130,6 +2130,31 @@ then
   AC_DEFINE(HAVE_QUERY_CACHE)
 fi
 
+AC_ARG_WITH(geometry,
+    [  --without-geometry      Do not build geometry-related parts.],
+    [with_geometry=$withval],
+    [with_geometry=yes]
+)
+
+if test "$with_geometry" = "yes"
+then
+  AC_DEFINE(HAVE_SPATIAL)
+  AC_DEFINE(HAVE_RTREE_KEYS)
+fi
+
+AC_ARG_WITH(embedded_privilege_control,
+    [  --with-embedded-privilege-control
+                          Build parts to check user's privileges.
+			  Only affects embedded library.],
+    [with_embedded_privilege_control=$withval],
+    [with_embedded_privilege_control=no]
+)
+
+if test "$with_embedded_privilege_control" = "yes"
+then
+  AC_DEFINE(HAVE_EMBEDDED_PRIVILEGE_CONTROL)
+fi
+
 AC_ARG_WITH(extra-tools,
     [  --without-extra-tools   Skip building utilites in the tools directory.],
     [with_tools=$withval],
diff --git a/include/my_global.h b/include/my_global.h
index 2a82173979d..46ad99811f7 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -1169,6 +1169,8 @@ typedef union {
 #define MYSQL_UNIVERSAL_CLIENT_CHARSET MYSQL_DEFAULT_CHARSET_NAME
 #endif
 
-#define HAVE_SPATIAL
-#define HAVE_RTREE_KEYS
+#if defined(EMBEDDED_LIBRARY) && !defined(HAVE_EMBEDDED_PRIVILEGE_CONTROL)
+#define NO_EMBEDDED_ACCESS_CHECKS
+#endif
+
 #endif /* my_global_h */