diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-06-14 11:46:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-06-14 11:46:38 -0400 |
| commit | a7cafb1ea9307864c94ad3e019af93d09d48350e (patch) | |
| tree | 1c6cc26fb0a93f46d839b3cb46855c93aca135f4 /configure.ac | |
| parent | a58d94fb7c6c304ecba930eaa7ebbade1d0686ab (diff) | |
| parent | e07d328457b26babe89abdcc1d5a550ee8273462 (diff) | |
| download | tor-a7cafb1ea9307864c94ad3e019af93d09d48350e.tar.gz tor-a7cafb1ea9307864c94ad3e019af93d09d48350e.zip | |
Merge branch 'bug8746_v2_squashed'
Conflicts:
src/common/include.am
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 6e9e13d761..deaa939817 100644 --- a/configure.ac +++ b/configure.ac @@ -367,6 +367,7 @@ AC_CHECK_FUNCS( sysconf \ sysctl \ uname \ + usleep \ vasprintf \ _vscprintf ) @@ -898,6 +899,7 @@ AC_CHECK_HEADERS( sys/param.h \ sys/prctl.h \ sys/resource.h \ + sys/select.h \ sys/socket.h \ sys/sysctl.h \ sys/syslimits.h \ |