summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2000-10-11 15:07:46 +0000
committerbala <balanatarajan@users.noreply.github.com>2000-10-11 15:07:46 +0000
commit21b86b55bb665b0664790b99125b9b98fcda3991 (patch)
tree0fe122eff082cab32d1dcc5fa7a0d6b76fc39e27
parente5d7a9df6a43eade5fa7ee440b245762d58bc2f7 (diff)
downloadATCD-21b86b55bb665b0664790b99125b9b98fcda3991.tar.gz
ChangeLogTag: Wed Oct 11 10:06:19 2000 Balachandran Natarajan <bala@cs.wustl.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a5
-rw-r--r--TAO/orbsvcs/orbsvcs/Makefile6
2 files changed, 8 insertions, 3 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index dd3dbc909ae..e84c9b7d8e9 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,8 @@
+Wed Oct 11 10:06:19 2000 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * orbsvcs/orbsvcs/Makefile: Prevented building FT service in
+ Minimum CORBA build.
+
Tue Oct 10 22:14:47 2000 Nanbor Wang <nanbor@cs.wustl.edu>
* TAOACE_Static.dsw: Added Event_Service_Static project.
diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile
index 0e4afc3858a..4b203e300aa 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile
+++ b/TAO/orbsvcs/orbsvcs/Makefile
@@ -46,7 +46,8 @@ ifndef TAO_ORBSVCS
TAO_ORBSVCS +=
ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
- TAO_ORBSVCS += LifeCycle
+ TAO_ORBSVCS += LifeCycle \
+ FaultTolerance
endif # ACE_HAS_GNUG_PRE_2_8
# The Load Balancer requires POA ServantLocator support, which
@@ -60,8 +61,7 @@ ifndef TAO_ORBSVCS
endif # ssl
ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
- TAO_ORBSVCS += Notify \
- FaultTolerance
+ TAO_ORBSVCS += Notify
endif # ACE_HAS_GNUG_PRE_2_8
endif # TAO_ORBSVCS