configure: Make --disable-module-relay imply --disable-module-dirauth

Part of 32123.
This commit is contained in:
teor 2019-10-17 16:10:45 +10:00
parent 2e2e1ed765
commit fdf47e0f0b

View File

@ -260,7 +260,7 @@ m4_define(MODULES, relay dirauth)
dnl Relay module. dnl Relay module.
AC_ARG_ENABLE([module-relay], AC_ARG_ENABLE([module-relay],
AS_HELP_STRING([--disable-module-relay], AS_HELP_STRING([--disable-module-relay],
[Build tor without the Relay modules: tor can not run as a relay, bridge, or authority])) [Build tor without the Relay modules: tor can not run as a relay, bridge, or authority. Implies --disable-module-dirauth]))
AM_CONDITIONAL(BUILD_MODULE_RELAY, [test "x$enable_module_relay" != "xno"]) AM_CONDITIONAL(BUILD_MODULE_RELAY, [test "x$enable_module_relay" != "xno"])
AM_COND_IF(BUILD_MODULE_RELAY, AM_COND_IF(BUILD_MODULE_RELAY,
AC_DEFINE([HAVE_MODULE_RELAY], [1], AC_DEFINE([HAVE_MODULE_RELAY], [1],
@ -270,7 +270,7 @@ dnl Directory Authority module.
AC_ARG_ENABLE([module-dirauth], AC_ARG_ENABLE([module-dirauth],
AS_HELP_STRING([--disable-module-dirauth], AS_HELP_STRING([--disable-module-dirauth],
[Build tor without the Directory Authority module: tor can not run as a directory authority or bridge authority])) [Build tor without the Directory Authority module: tor can not run as a directory authority or bridge authority]))
AM_CONDITIONAL(BUILD_MODULE_DIRAUTH,[test "x$enable_module_dirauth" != "xno"]) AM_CONDITIONAL(BUILD_MODULE_DIRAUTH,[test "x$enable_module_dirauth" != "xno" && test "x$enable_module_relay" != "xno"])
AM_COND_IF(BUILD_MODULE_DIRAUTH, AM_COND_IF(BUILD_MODULE_DIRAUTH,
AC_DEFINE([HAVE_MODULE_DIRAUTH], [1], AC_DEFINE([HAVE_MODULE_DIRAUTH], [1],
[Compile with Directory Authority feature support])) [Compile with Directory Authority feature support]))