aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-02-18 15:50:40 +0100
committerSverker Eriksson <[email protected]>2016-02-18 15:50:40 +0100
commitfcc8375cb66d3080bb03f8e80aca19e7f5784240 (patch)
treedbe5e0209cb37bc22777620934a7dd28b3f5f9f7
parenta4c70ebcd1a45e48f48ff65986b421b30dd89487 (diff)
parent8e96e6010cb123b1737d7d3b5dbd0e059f6e1045 (diff)
downloadotp-fcc8375cb66d3080bb03f8e80aca19e7f5784240.tar.gz
otp-fcc8375cb66d3080bb03f8e80aca19e7f5784240.tar.bz2
otp-fcc8375cb66d3080bb03f8e80aca19e7f5784240.zip
Merge branch 'maint'
-rw-r--r--HOWTO/INSTALL.md8
1 files changed, 7 insertions, 1 deletions
diff --git a/HOWTO/INSTALL.md b/HOWTO/INSTALL.md
index c1b6f44046..0b78f4ca56 100644
--- a/HOWTO/INSTALL.md
+++ b/HOWTO/INSTALL.md
@@ -374,9 +374,15 @@ Some of the available `configure` options are:
`jinterface` application won't be built)
* `--{enable,disable}-dynamic-ssl-lib` - Dynamic OpenSSL libraries
* `--{enable,disable}-builtin-zlib` - Use the built-in source for zlib.
-* `--with-ssl=PATH` - Specify location of OpenSSL include and lib
* `--{with,without}-ssl` - OpenSSL (without implies that the `crypto`,
`ssh`, and `ssl` won't be built)
+* `--with-ssl=PATH` - Specify location of OpenSSL include and lib
+* `--with-ssl-incl=PATH` - Location of OpenSSL `include` directory,
+ if different than specified by `--with-ssl=PATH`
+* `--with-ssl-rpath=yes|no|PATHS` - Runtime library path for OpenSSL.
+ Default is `yes`, which equates to a number of standard locations. If
+ `no`, then no runtime library paths wil be used. Anything else should be
+ a comma separated list of paths.
* `--with-libatomic_ops=PATH` - Use the `libatomic_ops` library for atomic
memory accesses. If `configure` should inform you about no native atomic
implementation available, you typically want to try using the