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 /src/common | |
| parent | fef65fa64341fb70df0e7b34d91d3b08a74e7aad (diff) | |
| parent | 170e0df7417e78f7b689f3189e7a0b5b8dfd2722 (diff) | |
| download | tor-1a73e178011d24ad2ef252dab7256d7c4fa94a64.tar tor-1a73e178011d24ad2ef252dab7256d7c4fa94a64.tar.gz | |
Merge remote-tracking branch 'andrea/bug11476'
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/include.am | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/common/include.am b/src/common/include.am index 7b2465cd8..61a90cd35 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -24,6 +24,14 @@ else libor_extra_source= endif +if USE_MEMPOOLS +libor_mempool_source=src/common/mempool.c +libor_mempool_header=src/common/mempool.h +else +libor_mempool_source= +libor_mempool_header= +endif + src_common_libcurve25519_donna_a_CFLAGS= if BUILD_CURVE25519_DONNA @@ -56,13 +64,13 @@ LIBOR_A_SOURCES = \ src/common/di_ops.c \ src/common/log.c \ src/common/memarea.c \ - src/common/mempool.c \ src/common/procmon.c \ src/common/util.c \ src/common/util_codedigest.c \ src/common/sandbox.c \ src/ext/csiphash.c \ - $(libor_extra_source) + $(libor_extra_source) \ + $(libor_mempool_source) LIBOR_CRYPTO_A_SOURCES = \ src/common/aes.c \ @@ -102,7 +110,6 @@ COMMONHEADERS = \ src/common/crypto_curve25519.h \ src/common/di_ops.h \ src/common/memarea.h \ - src/common/mempool.h \ src/common/linux_syscalls.inc \ src/common/procmon.h \ src/common/sandbox.h \ @@ -111,7 +118,8 @@ COMMONHEADERS = \ src/common/torint.h \ src/common/torlog.h \ src/common/tortls.h \ - src/common/util.h + src/common/util.h \ + $(libor_mempool_header) noinst_HEADERS+= $(COMMONHEADERS) |