diff options
| author | Sverker Eriksson <[email protected]> | 2014-10-02 15:51:09 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2014-10-02 15:52:23 +0200 |
| commit | edd24536805528c0701d8cf8b0cacac51e5abb09 (patch) | |
| tree | f090153e3a5b5e99b13ba97a606427f89c25d4cb /configure.in | |
| parent | fec05d96ce4d9cc77bd3dfb06e474600854c6dd8 (diff) | |
| parent | ededb6c8c75061ddf3d02a129166fc4f2b12e54a (diff) | |
| download | otp-edd24536805528c0701d8cf8b0cacac51e5abb09.tar.gz otp-edd24536805528c0701d8cf8b0cacac51e5abb09.tar.bz2 otp-edd24536805528c0701d8cf8b0cacac51e5abb09.zip | |
Merge branch 'sverk/with-ssl-incl' into maint
* sverk/with-ssl-incl:
Correct SSL_RUNTIME_LIBDIR when erl_xcomp_sysroot ends with a /
Add configure option --with-ssl-incl=PATH
OTP-12215
OTP-12216
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 780e660f9d..be169b8428 100644 --- a/configure.in +++ b/configure.in @@ -262,6 +262,10 @@ AS_HELP_STRING([--with-ssl=PATH], [specify location of OpenSSL include and lib]) AS_HELP_STRING([--with-ssl], [use SSL (default)]) AS_HELP_STRING([--without-ssl], [don't use SSL])) +AC_ARG_WITH(ssl-incl, +AS_HELP_STRING([--with-ssl-incl=PATH], + [location of OpenSSL include dir, if different than specified by --with-ssl=PATH])) + AC_ARG_ENABLE(dynamic-ssl-lib, AS_HELP_STRING([--disable-dynamic-ssl-lib], [disable using dynamic openssl libraries])) |