diff options
| author | Micael Karlberg <[email protected]> | 2019-05-02 10:16:04 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2019-05-02 10:16:04 +0200 |
| commit | 5c3b8ece50b2dfa66351198375acf4a5f08833ac (patch) | |
| tree | 2d1d42872f10a68656793638c460c3f76859a8c5 /make | |
| parent | 202ac7dcd4060b463a08d6bca09529c95d5855f4 (diff) | |
| parent | b49f68d5d8a256a7a0847d939b2da8a4be6c728a (diff) | |
| download | otp-5c3b8ece50b2dfa66351198375acf4a5f08833ac.tar.gz otp-5c3b8ece50b2dfa66351198375acf4a5f08833ac.tar.bz2 otp-5c3b8ece50b2dfa66351198375acf4a5f08833ac.zip | |
Merge branch 'bmk/erts/esock/20190430/configure_esock_include/OTP-15658'
Diffstat (limited to 'make')
| -rw-r--r-- | make/configure.in | 6 | ||||
| -rw-r--r-- | make/otp.mk.in | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/make/configure.in b/make/configure.in index bf3fd0751f..c4b89c4f45 100644 --- a/make/configure.in +++ b/make/configure.in @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. dnl %CopyrightBegin% dnl -dnl Copyright Ericsson AB 1998-2016. All Rights Reserved. +dnl Copyright Ericsson AB 1998-2019. All Rights Reserved. dnl dnl Licensed under the Apache License, Version 2.0 (the "License"); dnl you may not use this file except in compliance with the License. @@ -298,6 +298,10 @@ AC_ARG_ENABLE(builtin-zlib, AS_HELP_STRING([--enable-builtin-zlib], [force use of our own built-in zlib])) +AC_ARG_ENABLE(esock, +AS_HELP_STRING([--enable-esock], [enable builtin experimental socket (as a nif) support (default)]) +AS_HELP_STRING([--disable-esock], [disable builtin experimental socket (as a nif) support])) + AC_ARG_ENABLE(sharing-preserving, AS_HELP_STRING([--enable-sharing-preserving], [enable copying of terms without destroying sharing])) diff --git a/make/otp.mk.in b/make/otp.mk.in index ceff8f7c31..cdddb90734 100644 --- a/make/otp.mk.in +++ b/make/otp.mk.in @@ -4,7 +4,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 1997-2016. All Rights Reserved. +# Copyright Ericsson AB 1997-2019. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -51,6 +51,8 @@ TYPES = @TYPES@ USE_PGO = @USE_PGO@ +USE_ESOCK = @USE_ESOCK@ + # Slash separated list of return values from $(origin VAR) # that are untrusted - set default in this file instead. # The list is not space separated since some return values |