commit f0f3f3338e220f773b4921215f3c9955f5601a7c
parent 0994050c4a766fad94ce5108e99d18b0a6200e5f
Author: Nick Mathewson <nickm@torproject.org>
Date: Fri, 18 Oct 2019 12:42:49 -0400
Merge remote-tracking branch 'tor-github/pr/1427' into maint-0.4.2
Diffstat:
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/changes/bug32124 b/changes/bug32124
@@ -0,0 +1,7 @@
+ o Minor bugfixes (build system):
+ - Stop failing when jemalloc is requested, but tcmalloc is not found.
+ Fixes bug 32124; bugfix on 0.3.5.1-alpha.
+ - Interpret --disable-module-dirauth=no correctly.
+ Fixes bug 32124; bugfix on 0.3.4.1-alpha.
+ - Interpret --with-tcmalloc=no correctly.
+ Fixes bug 32124; bugfix on 0.2.0.20-rc.
diff --git a/configure.ac b/configure.ac
@@ -258,11 +258,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=
@@ -1894,8 +1894,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
@@ -1904,7 +1903,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
@@ -1935,7 +1934,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
