summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2002-11-29 14:03:08 +0000
committerbala <balanatarajan@users.noreply.github.com>2002-11-29 14:03:08 +0000
commit4c08203cd9592e741af1c23e1c021629b9a7defa (patch)
treec0df55ca8e7c2d07c0318b806e9a5b06bee2a673
parentfda05db3dd684936c50b61a3aceb230488ee3002 (diff)
downloadATCD-4c08203cd9592e741af1c23e1c021629b9a7defa.tar.gz
ChangeLogTag: Fri Nov 29 08:01:56 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
-rw-r--r--TAO/ChangeLog5
-rw-r--r--TAO/orbsvcs/orbsvcs/Makefile10
2 files changed, 11 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index db5b8c7be80..e7888afbd5e 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 29 08:01:56 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
+
+ * orbsvcs/orbsvcs/Makefile: PortableGroup will not be compiled if
+ AMI is disabled.
+
Fri Nov 29 11:55:41 2002 D A Hanvey <d.hanvey@qub.ac.uk>
* orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile
index cf44d97abf0..821af271c33 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile
+++ b/TAO/orbsvcs/orbsvcs/Makefile
@@ -69,17 +69,19 @@ ifndef TAO_ORBSVCS
TAO_ORBSVCS += RTCORBAEvent
endif #corba_messaging
+ # The PortableGroup library requires several methods in the POA,
+ # which are disabled by Minimum CORBA. Further it also needs AMI
+ # support
ifeq ($(ami),1)
+ TAO_ORBSVCS += PortableGroup
ifeq ($(interceptors),1)
# The Load Balancer requires AMI and Interceptor support.
TAO_ORBSVCS += CosLoadBalancing
endif #interceptors
endif #ami
- # The PortableGroup library requires several methods in the POA,
- # which are disabled by Minimum CORBA.
- TAO_ORBSVCS += PortableGroup \
- ImplRepo
+
+ TAO_ORBSVCS += ImplRepo
endif # minimum_corba