diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-05-22 16:27:29 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-05-22 16:27:29 -0400 |
| commit | 1a73e178011d24ad2ef252dab7256d7c4fa94a64 (patch) | |
| tree | 35990ad7f447fcebe8422aed4b66047f9fec2d29 /configure.ac | |
| parent | fef65fa64341fb70df0e7b34d91d3b08a74e7aad (diff) | |
| parent | 170e0df7417e78f7b689f3189e7a0b5b8dfd2722 (diff) | |
| download | tor-1a73e178011d24ad2ef252dab7256d7c4fa94a64.tar.gz tor-1a73e178011d24ad2ef252dab7256d7c4fa94a64.zip | |
Merge remote-tracking branch 'andrea/bug11476'
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index d3210921e7..6e9e13d761 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,9 @@ CPPFLAGS="$CPPFLAGS -I\${top_srcdir}/src/common" #XXXX020 We should make these enabled or not, before 0.2.0.x-final AC_ARG_ENABLE(buf-freelists, - AS_HELP_STRING(--disable-buf-freelists, disable freelists for buffer RAM)) + AS_HELP_STRING(--enable-buf-freelists, enable freelists for buffer RAM)) +AC_ARG_ENABLE(mempools, + AS_HELP_STRING(--enable-mempools, enable mempools for relay cells)) AC_ARG_ENABLE(openbsd-malloc, AS_HELP_STRING(--enable-openbsd-malloc, Use malloc code from openbsd. Linux only)) AC_ARG_ENABLE(instrument-downloads, @@ -54,10 +56,17 @@ if test "$enable_static_tor" = "yes"; then CFLAGS="$CFLAGS -static" fi -if test x$enable_buf_freelists != xno; then +if test x$enable_buf_freelists = xyes; then AC_DEFINE(ENABLE_BUF_FREELISTS, 1, [Defined if we try to use freelists for buffer RAM chunks]) fi + +AM_CONDITIONAL(USE_MEMPOOLS, test x$enable_mempools = xyes) +if test x$enable_mempools = xyes; then + AC_DEFINE(ENABLE_MEMPOOLS, 1, + [Defined if we try to use mempools for cells being relayed]) +fi + AM_CONDITIONAL(USE_OPENBSD_MALLOC, test x$enable_openbsd_malloc = xyes) if test x$enable_instrument_downloads = xyes; then AC_DEFINE(INSTRUMENT_DOWNLOADS, 1, |