diff options
author | Nick Mathewson <nickm@torproject.org> | 2019-10-18 12:42:56 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2019-10-18 12:42:56 -0400 |
commit | 37320bce064730b111018d255009390d887a8a17 (patch) | |
tree | 1512c3d04ec0bf41764bf995800141a84c2320a1 /configure.ac | |
parent | 264c5312eb7fc70b092b22ec978c1b400b7fd826 (diff) | |
parent | f0f3f3338e220f773b4921215f3c9955f5601a7c (diff) | |
download | tor-37320bce064730b111018d255009390d887a8a17.tar.gz tor-37320bce064730b111018d255009390d887a8a17.zip |
Merge branch 'maint-0.4.2'
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 4793dacac6..c0db30e60e 100644 --- a/configure.ac +++ b/configure.ac @@ -260,11 +260,11 @@ m4_define(MODULES, dirauth) 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 an authority]), - [], dnl Action if-given - AC_DEFINE([HAVE_MODULE_DIRAUTH], [1], - [Compile with Directory Authority feature support])) -AM_CONDITIONAL(BUILD_MODULE_DIRAUTH, [test "x$enable_module_dirauth" != "xno"]) + [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_COND_IF(BUILD_MODULE_DIRAUTH, + AC_DEFINE([HAVE_MODULE_DIRAUTH], [1], + [Compile with Directory Authority feature support])) dnl Helper variables. TOR_MODULES_ALL_ENABLED= @@ -1896,8 +1896,7 @@ if test "$tor_cv_uint8_uchar" = "no"; then fi AC_ARG_WITH(tcmalloc, -AS_HELP_STRING(--with-tcmalloc, [use tcmalloc memory allocation library. Deprecated; see --with-malloc]), -[ tcmalloc=yes ], [ tcmalloc=no ]) +AS_HELP_STRING(--with-tcmalloc, [use tcmalloc memory allocation library. Deprecated; see --with-malloc])) default_malloc=system @@ -1906,7 +1905,7 @@ if test "x$enable_openbsd_malloc" = "xyes" ; then default_malloc=openbsd fi -if test "x$tcmalloc" = "xyes"; then +if test "x$with_tcmalloc" = "xyes"; then AC_MSG_NOTICE([The --with-tcmalloc argument is deprecated; use --with-malloc=tcmalloc instead.]) default_malloc=tcmalloc fi @@ -1937,7 +1936,7 @@ AS_CASE([$malloc], have_jemalloc=yes, have_jemalloc=no) - if test "x$have_tcmalloc" = "xno" ; then + if test "x$have_jemalloc" = "xno" ; then AC_MSG_ERROR([Unable to find jemalloc requested by --with-malloc, $pkg_config_user_action, or set JEMALLOC_CFLAGS and JEMALLOC_LIBS.]) fi |