Commit 55837756 authored by Iustin Pop's avatar Iustin Pop
Browse files

Try to auto-enable htools-rapi and split query



We try to automatically enable the htools-rapi and split query (if
confd and htools-rapi are enabled) options. This is our intended
default configuration, and allows easier test of the new code
path. Further cleanups for checking whether confd can be enabled will
come later.

The move block is due to the fact that we first have to check for
htools-rapi, and only then we can auto-enable the feature.
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parent 39d1744a
...@@ -324,7 +324,7 @@ AC_ARG_ENABLE([htools-rapi], ...@@ -324,7 +324,7 @@ AC_ARG_ENABLE([htools-rapi],
[AS_HELP_STRING([--enable-htools-rapi], [AS_HELP_STRING([--enable-htools-rapi],
[enable use of RAPI in htools (needs curl, default: no)])], [enable use of RAPI in htools (needs curl, default: no)])],
[], [],
[enable_htools_rapi=no]) [enable_htools_rapi=check])
# --enable-confd # --enable-confd
ENABLE_CONFD= ENABLE_CONFD=
...@@ -349,31 +349,6 @@ AC_SUBST(ENABLE_CONFD, $enable_confd) ...@@ -349,31 +349,6 @@ AC_SUBST(ENABLE_CONFD, $enable_confd)
AM_CONDITIONAL([ENABLE_CONFD], [test x$enable_confd = xTrue]) AM_CONDITIONAL([ENABLE_CONFD], [test x$enable_confd = xTrue])
# --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
]],
[enable_split_query=False])
AC_SUBST(ENABLE_SPLIT_QUERY, $enable_split_query)
if test x$enable_split_query = xTrue -a x$enable_confd != xTrue; then
AC_MSG_ERROR([Split queries require the confd daemon])
fi
# --with-disk-separator=... # --with-disk-separator=...
AC_ARG_WITH([disk-separator], AC_ARG_WITH([disk-separator],
[AS_HELP_STRING([--with-disk-separator=STRING], [AS_HELP_STRING([--with-disk-separator=STRING],
...@@ -548,6 +523,46 @@ if test "$enable_htools" != "no"; then ...@@ -548,6 +523,46 @@ if test "$enable_htools" != "no"; then
fi fi
AC_SUBST(HTOOLS) 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${enable_confd}x${HTOOLS_NOCURL}x" in
xTruexx)
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$enable_confd != xTrue; then
AC_MSG_ERROR([Split queries require the confd daemon])
fi
if test x$enable_split_query = xTrue -a x$HTOOLS_NOCURL != x; then
AC_MSG_ERROR([Split queries require the htools-rapi feature (curl library)])
fi
if test x$enable_split_query = xTrue; then
AC_MSG_NOTICE([Split query functionality enabled])
fi
# Check for HsColour # Check for HsColour
HTOOLS_APIDOC=no HTOOLS_APIDOC=no
AC_ARG_VAR(HSCOLOUR, [HsColour path]) AC_ARG_VAR(HSCOLOUR, [HsColour path])
......
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