diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-09-25 12:03:41 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-09-25 12:03:41 -0400 |
| commit | 764e0080929fe2e0fc05a226d340a189d264876b (patch) | |
| tree | 21dc878bf63eae8304fc587a166f129201e584f3 /configure.ac | |
| parent | ecab2616413b06754bfb110eab2bfbf58e3a57b2 (diff) | |
| parent | c4337367341f0542a13990c55f0c6cdeca203659 (diff) | |
| download | tor-764e0080929fe2e0fc05a226d340a189d264876b.tar.gz tor-764e0080929fe2e0fc05a226d340a189d264876b.zip | |
Merge branch 'libscrypt_trunnel_squashed'
Conflicts:
src/test/test_crypto.c
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 5aeeeb4025..3d35099639 100644 --- a/configure.ac +++ b/configure.ac @@ -153,6 +153,9 @@ AC_ARG_ENABLE(tool-name-check, AC_ARG_ENABLE(seccomp, AS_HELP_STRING(--disable-seccomp, do not attempt to use libseccomp)) +AC_ARG_ENABLE(libscrypt, + AS_HELP_STRING(--disable-libscrypt, do not attempt to use libscrypt)) + dnl check for the correct "ar" when cross-compiling AN_MAKEVAR([AR], [AC_PROG_AR]) AN_PROGRAM([ar], [AC_PROG_AR]) @@ -723,6 +726,14 @@ if test "x$enable_seccomp" != "xno"; then fi dnl ============================================================ +dnl Check for libscrypt + +if test "x$enable_libscrypt" != "xno"; then + AC_CHECK_HEADERS([libscrypt.h]) + AC_SEARCH_LIBS(libscrypt_scrypt, [scrypt]) +fi + +dnl ============================================================ dnl We need an implementation of curve25519. dnl set these defaults. |