From eebdde01b149ea45966c7412bc2a062136457b54 Mon Sep 17 00:00:00 2001
From: Yiannis Tsiouris <gtsiour@softlab.ntua.gr>
Date: Tue, 22 Jan 2013 18:16:33 +0200
Subject: Add --enable-sharing-preserving configure flag

---
 erts/emulator/beam/erl_bif_info.c | 3 +++
 erts/emulator/beam/global.h       | 5 +----
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'erts/emulator/beam')

diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index 1eb106a551..82c2aa4b9e 100644
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -129,6 +129,9 @@ static char erts_system_version[] = ("Erlang/OTP " ERLANG_OTP_RELEASE
 #endif
 #ifdef USE_SYSTEMTAP
 				     " [systemtap]"
+#endif
+#ifdef SHCOPY
+				     " [sharing-preserving]"
 #endif
 				     "\n");
 
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h
index 303b9ee51b..3c59df5f41 100644
--- a/erts/emulator/beam/global.h
+++ b/erts/emulator/beam/global.h
@@ -1038,12 +1038,9 @@ void erl_error(char*, va_list);
 
 /* This controls whether sharing-preserving copy is used by Erlang */
 
+#ifdef SHCOPY
 #define SHCOPY_SEND
 #define SHCOPY_SPAWN
-
-#if defined(SHCOPY_SEND) \
- || defined(SHCOPY_SPAWN)
-#define SHCOPY
 /* Use this if you want sharing-preserving copy to be initially disabled */
 #undef SHCOPY_DISABLE
 #endif
-- 
cgit v1.2.3