diff options
author | Nick Mathewson <nickm@torproject.org> | 2016-05-27 13:22:16 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2016-05-27 13:22:16 -0400 |
commit | 1e5ad15688ee3f3660fe35cab23022126b55262d (patch) | |
tree | 2d0441c9faf68dbb9c02f0c1dfab62cd7a584ca9 /configure.ac | |
parent | 617b9205515a8ee5f9ddf4fac14eff5178111641 (diff) | |
parent | 3b83da1069f963bc0e9806cdeebc16fb8c2a6129 (diff) | |
download | tor-1e5ad15688ee3f3660fe35cab23022126b55262d.tar.gz tor-1e5ad15688ee3f3660fe35cab23022126b55262d.zip |
Merge remote-tracking branch 'arma/task19035-fixedup'
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 9bd8eb21bc..26f85b5acf 100644 --- a/configure.ac +++ b/configure.ac @@ -33,8 +33,6 @@ CPPFLAGS="$CPPFLAGS -I\${top_srcdir}/src/common" #XXXX020 We should make these enabled or not, before 0.2.0.x-final AC_ARG_ENABLE(openbsd-malloc, AS_HELP_STRING(--enable-openbsd-malloc, [use malloc code from OpenBSD. Linux only])) -AC_ARG_ENABLE(instrument-downloads, - AS_HELP_STRING(--enable-instrument-downloads, [instrument downloads of directory resources etc.])) AC_ARG_ENABLE(static-openssl, AS_HELP_STRING(--enable-static-openssl, [link against a static openssl library. Requires --with-openssl-dir])) AC_ARG_ENABLE(static-libevent, @@ -73,10 +71,6 @@ if test "$enable_system_torrc" = "no"; then 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, - [Defined if we want to keep track of how much of each kind of resource we download.]) -fi AC_ARG_ENABLE(transparent, AS_HELP_STRING(--disable-transparent, [disable transparent proxy support]), |