diff options
| author | Hans Nilsson <hans@erlang.org> | 2016-10-11 16:01:24 +0200 |
|---|---|---|
| committer | Hans Nilsson <hans@erlang.org> | 2016-10-11 16:01:24 +0200 |
| commit | fec3e5165d2583969770114cc14d0e39a422d61a (patch) | |
| tree | f6e8dff23a24e3ba32a05af739ef28220aecd6ca /configure.in | |
| parent | 301c8e78a1445c0d0080fdb758a3b9e8140fb626 (diff) | |
| parent | 0411d5492319a5bc555247a3f783aaa421b4f31c (diff) | |
| download | erlang-fec3e5165d2583969770114cc14d0e39a422d61a.tar.gz | |
Merge branch 'legoscia/ssl_in_fips_mode/PR-1180/OTP-13921'
Conflicts:
lib/crypto/c_src/crypto.c
lib/ssl/src/ssl_cipher.erl
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 6db83124be..9c21265dc8 100644 --- a/configure.in +++ b/configure.in @@ -280,6 +280,10 @@ AC_ARG_ENABLE(dynamic-ssl-lib, AS_HELP_STRING([--disable-dynamic-ssl-lib], [disable using dynamic openssl libraries])) +AC_ARG_ENABLE(fips, +AS_HELP_STRING([--enable-fips], [enable OpenSSL FIPS mode support]) +AS_HELP_STRING([--disable-fips], [disable OpenSSL FIPS mode support (default)])) + AC_ARG_ENABLE(builtin-zlib, AS_HELP_STRING([--enable-builtin-zlib], [force use of our own built-in zlib])) |