From bfb0d9ddca07072aff7604dc45dca81e315470b9 Mon Sep 17 00:00:00 2001
From: Nick Barnes <nb@ravenbrook.com>
Date: Mon, 24 Sep 2001 15:37:46 +0100
Subject: [PATCH] =?UTF-8?q?Remove=20dongle=20dependency=20for=20release=20?=
 =?UTF-8?q?to=20configura.=20=20i=20actually=20made=20the=20release=20to?=
 =?UTF-8?q?=20configura=20by=20ftping=20the=20source=20tree=20to=20g=C3=B6?=
 =?UTF-8?q?ran's=20desktop=20machine,=20making=20a=20change=20like=20this?=
 =?UTF-8?q?=20one,=20making=20the=20libraries,=20and=20running=20gathconf.?=
 =?UTF-8?q?bat.=20=20that=20got=20him=20running=20while=20i=20was=20still?=
 =?UTF-8?q?=20there,=20which=20was=20critical=20at=20the=20time.=20=20this?=
 =?UTF-8?q?=20is=20my=20closest=20approximation=20to=20the=20sources=20fro?=
 =?UTF-8?q?m=20which=20we=20built=20there.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Copied from Perforce
 Change: 22630
 ServerID: perforce.ravenbrook.com
---
 mps/src/commpost.nmk | 2 +-
 mps/src/config.h     | 4 +---
 mps/src/w3i3mv.nmk   | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/mps/src/commpost.nmk b/mps/src/commpost.nmk
index 1127ed70df4..5248ab33aba 100644
--- a/mps/src/commpost.nmk
+++ b/mps/src/commpost.nmk
@@ -216,7 +216,7 @@ $(PFM)\$(VARIETY)\mmdw.lib: $(MPMOBJ) $(AMCOBJ) $(DWOBJ) \
 $(PFM)\$(VARIETY)\mps_conf.lib: $(CONFIGURAOBJ) $(AMCOBJ) $(LOOBJ) $(SNCOBJ) \
         $(MVFFOBJ) $(AMSOBJ)
 	$(ECHO) $@
-	$(LIBMAN) $(LIBFLAGS) /OUT:$@ $(DONGLELIB) $**
+	$(LIBMAN) $(LIBFLAGS) /OUT:$@ $**
 
 $(PFM)\$(VARIETY)\mpsplan.lib: $(PLINTHOBJ)
 	$(ECHO) $@
diff --git a/mps/src/config.h b/mps/src/config.h
index 867e22e9692..b42d2cea33e 100644
--- a/mps/src/config.h
+++ b/mps/src/config.h
@@ -274,9 +274,7 @@
 #define ARENA_INIT_SPARE_COMMIT_LIMIT   ((Size)10uL*1024uL*1024uL)
 #define THREAD_SINGLE
 #define PROTECTION
-#define DONGLE
-/* global dongles have customerID 0 */
-#define DONGLE_CUSTOMER_ID ((int)1)
+#define DONGLE_NONE
 
 #elif defined(CONFIG_PROD_MPS)
 #define MPS_PROD_STRING         "mps"
diff --git a/mps/src/w3i3mv.nmk b/mps/src/w3i3mv.nmk
index f76e96e1829..d723903fe9d 100644
--- a/mps/src/w3i3mv.nmk
+++ b/mps/src/w3i3mv.nmk
@@ -28,7 +28,7 @@ SW  = <assert> <ring> <mpm> <bt> <protocol> \
       <poolepdl> <poolepvm> <poolams> <dbgpool> \
       <abq> <meter> <cbs> <poolmv2> <splay> <version> <poolmvff>
 CONFIGURA = <assert> <ring> <mpm> <bt> <protocol> \
-      <arenavm> <arenacl> <arena> <tract> <walk> <reserv> <dongle> \
+      <arenavm> <arenacl> <arena> <tract> <walk> <reserv> \
       <pool> <poolabs> <poolmfs> <poolmv> \
       <root> <format> <buffer> \
       <ref> <trace> <protw3> <proti3> <prmci3w3> <shield> <vmw3> \