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

Part of 32123.

diff --git a/configure.ac b/configure.ac
index dcb8b1e385ef2040d59a5f133edab75af583648b..9a903fb11efb4fa1439fe7c27a0a874e033ca10b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -260,7 +260,7 @@ m4_define(MODULES, relay dirauth)
 dnl Relay module.
 AC_ARG_ENABLE([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_COND_IF(BUILD_MODULE_RELAY,
            AC_DEFINE([HAVE_MODULE_RELAY], [1],
@@ -270,7 +270,7 @@ dnl Directory Authority module.
 AC_ARG_ENABLE([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]))
-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,
            AC_DEFINE([HAVE_MODULE_DIRAUTH], [1],
                      [Compile with Directory Authority feature support]))