Commit 1211c6ed authored by Helga Velroyen's avatar Helga Velroyen
Browse files

Remove --enable-split-query option



Switching from python to haskell queries, this patch
removes the option to dis/enable the haskell queries
at configure time.
Signed-off-by: default avatarHelga Velroyen <helgav@google.com>
Reviewed-by: default avatarHrvoje Ribicic <riba@google.com>
parent fd201010
......@@ -1829,7 +1829,6 @@ src/AutoConf.hs: Makefile src/AutoConf.hs.in $(PRINT_PY_CONSTANTS) \
-DHTOOLS="True" \
-DENABLE_CONFD="$(ENABLE_CONFD)" \
-DXEN_CMD="$(XEN_CMD)" \
-DENABLE_SPLIT_QUERY="$(ENABLE_SPLIT_QUERY)" \
-DENABLE_RESTRICTED_COMMANDS="$(ENABLE_RESTRICTED_COMMANDS)" \
-DENABLE_MOND="$(ENABLE_MOND)" \
-DHAS_GNU_LN="$(HAS_GNU_LN)" \
......
......@@ -623,42 +623,6 @@ AC_SUBST(HS_NODEV)
HTOOLS=yes
AC_SUBST(HTOOLS)
# --enable-split-query
ENABLE_SPLIT_QUERY=
AC_ARG_ENABLE([split-query],
[AS_HELP_STRING([--enable-split-query],
[enable use of custom query daemon via confd])],
[[case "$enableval" in
no)
enable_split_query=False
;;
yes)
enable_split_query=True
;;
*)
echo "Invalid value for enable-confd '$enableval'"
exit 1
;;
esac
]],
[[case "x${has_confd}x" in
xTruex)
enable_split_query=True
;;
*)
enable_split_query=False
;;
esac]])
AC_SUBST(ENABLE_SPLIT_QUERY, $enable_split_query)
if test x$enable_split_query = xTrue -a x$has_confd != xTrue; then
AC_MSG_ERROR([Split queries require the confd daemon])
fi
if test x$enable_split_query = xTrue; then
AC_MSG_NOTICE([Split query functionality enabled])
fi
# Check for HsColour
HS_APIDOC=no
AC_ARG_VAR(HSCOLOUR, [HsColour path])
......
......@@ -2379,7 +2379,7 @@ def GetClient(query=False):
address = pathutils.QUERY_SOCKET
else:
address = override_socket
elif query and constants.ENABLE_SPLIT_QUERY:
elif query:
address = pathutils.QUERY_SOCKET
else:
address = None
......
......@@ -359,7 +359,7 @@ class ResourceBase(object):
instead of the masterd socket
"""
if query and constants.ENABLE_SPLIT_QUERY:
if query:
address = pathutils.QUERY_SOCKET
else:
address = None
......
......@@ -202,9 +202,6 @@ enableConfd = ENABLE_CONFD
xenCmd :: String
xenCmd = "XEN_CMD"
enableSplitQuery :: Bool
enableSplitQuery = ENABLE_SPLIT_QUERY
enableRestrictedCommands :: Bool
enableRestrictedCommands = ENABLE_RESTRICTED_COMMANDS
......
......@@ -313,9 +313,6 @@ enableMond = AutoConf.enableMond
enableRestrictedCommands :: Bool
enableRestrictedCommands = AutoConf.enableRestrictedCommands
enableSplitQuery :: Bool
enableSplitQuery = AutoConf.enableSplitQuery
-- * SSH constants
ssh :: String
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment