aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2019-03-07 17:27:44 +0100
committerMicael Karlberg <[email protected]>2019-04-30 10:58:16 +0200
commit9e34d5b91fda4c1021090fa00a8921cc2c8d2cb8 (patch)
tree8580ab0743b2dee79169b6b30af2d6b225ef7704 /make
parent759ec896d7f254db2996cbb503c1ef883e6714b0 (diff)
downloadotp-9e34d5b91fda4c1021090fa00a8921cc2c8d2cb8.tar.gz
otp-9e34d5b91fda4c1021090fa00a8921cc2c8d2cb8.tar.bz2
otp-9e34d5b91fda4c1021090fa00a8921cc2c8d2cb8.zip
[socket] Preliminary - make socket configurable
Preliminary work to make socket configurable (enable and disable). OTP-15658
Diffstat (limited to 'make')
-rw-r--r--make/configure.in6
-rw-r--r--make/otp.mk.in4
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