summaryrefslogtreecommitdiff
path: root/TAO/tao/orbconf.h
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-06-07 23:44:16 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-06-07 23:44:16 +0000
commitf2f95bee88f63c0a1a5cd157352e25d5cd36cdc3 (patch)
treeeb1a867dc255c43b7d9cf9f73532e58c8f6203b3 /TAO/tao/orbconf.h
parent503a42d0a98ca5081e312c4dfa23571030ded41f (diff)
downloadATCD-f2f95bee88f63c0a1a5cd157352e25d5cd36cdc3.tar.gz
ChangeLogTag:Wed Jun 7 16:37:28 2000 Carlos O'Ryan <coryan@uci.edu>
Diffstat (limited to 'TAO/tao/orbconf.h')
-rw-r--r--TAO/tao/orbconf.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 7e9097f4c1a..5f3d2223594 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -682,8 +682,9 @@ enum MCAST_SERVICEID
TAO_DISABLE_CORBA_MESSAGING_POLICIES == 0 */
#endif /* !TAO_HAS_BUFFERING_CONSTRAINT_POLICY */
-// AMI support is disabled by default. If enabled, it requires
-// CORBA_MESSAGING support.
+// AMI support is enabled by default, unless TAO is compiled with
+// Minimum CORBA. In that case AMI is disabled by default.
+// If disabled you can also disable the CORBA MESSAGING support.
// To explicitly enable AMI support uncomment the following
// #define TAO_HAS_AMI 1
// To explicitly disable AMI support uncomment the following
@@ -691,7 +692,11 @@ enum MCAST_SERVICEID
// Default AMI settings
#if !defined (TAO_HAS_AMI)
-# define TAO_HAS_AMI 0
+# if (TAO_HAS_MINIMUM_CORBA == 1)
+# define TAO_HAS_AMI 0
+# else
+# define TAO_HAS_AMI 1
+# endif /* TAO_HAS_MINIMUM_CORBA */
#else
# if (TAO_HAS_AMI == 1) && \
(TAO_HAS_CORBA_MESSAGING == 0)