torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.2' into release-0.4.2

Browse Source
This commit is contained in:
Nick Mathewson
2019-10-18 12:42:56 -04:00
parent 8b27498f12 f0f3f3338e
commit 00ad6f12fb
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug32124
+7
View File
@@ -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.
configure.ac
+8 -9
View File
@@ -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