summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2000-06-11 01:58:57 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2000-06-11 01:58:57 +0000
commit3212474eb2f23cc7b60daa97599cb9b5a3878c0c (patch)
treed9fe4b1c41668bbe354c6522ce82e8bc4d72d09c
parent367e7c2992c21073c2ca92ee719a85ff5a39216c (diff)
downloadATCD-3212474eb2f23cc7b60daa97599cb9b5a3878c0c.tar.gz
ChangeLogTag:Sat Jun 10 18:14:04 2000 Ossama Othman <ossama@uci.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a8
-rw-r--r--TAO/orbsvcs/orbsvcs/Makefile4
2 files changed, 11 insertions, 1 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 05bc1af6d20..7bc54fdcbb2 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,11 @@
+Sat Jun 10 18:14:04 2000 Ossama Othman <ossama@uci.edu>
+
+ * orbsvcs/orbsvcs/Makefile (TAO_ORBSVCS):
+
+ Only compile the Load Balancer if Minimum CORBA is disabled,
+ since it requires DSI support which is disabled in the Minimum
+ CORBA configuration.
+
Sat Jun 10 17:44:25 2000 Carlos O'Ryan <coryan@uci.edu>
* TAO_IDL/be/be_predefined_type.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile
index 1d38eb23215..fa1b639aa80 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile
+++ b/TAO/orbsvcs/orbsvcs/Makefile
@@ -26,7 +26,6 @@ ifndef TAO_ORBSVCS
#### TAO_ORBSVCS.
TAO_ORBSVCS = Naming \
Time \
- LoadBalancing \
Property \
RTEvent \
CosEvent \
@@ -46,6 +45,9 @@ ifndef TAO_ORBSVCS
TAO_ORBSVCS += LifeCycle Notify
endif # ACE_HAS_GNUG_PRE_2_8
+ # The Load Balancer requires DSI support, which Minimum CORBA disables.
+ TAO_ORBSVCS += LoadBalancing
+
endif # minimum_corba
endif # TAO_ORBSVCS