summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2012-02-23 08:07:13 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2012-02-23 08:07:13 +0000
commitfa0e0d4310579fb88b172f1e3ce276c901245885 (patch)
treea70f40337ae2b3ead4e50df8a6a2622a77c43068
parent714935333971ce857d239b91ad11d789bd1531d6 (diff)
downloadATCD-fa0e0d4310579fb88b172f1e3ce276c901245885.tar.gz
Thu Feb 23 08:06:40 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/orbconf.h: ZIOP depends on messaging
-rw-r--r--TAO/ChangeLog5
-rw-r--r--TAO/tao/orbconf.h5
2 files changed, 9 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index f991871b250..95449d2a339 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 23 08:06:40 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tao/orbconf.h:
+ ZIOP depends on messaging
+
Thu Feb 23 08:00:29 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* MPC/config/rlecompressor.mpb:
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index ae77d5c8c7f..259b61f7c6c 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -249,7 +249,10 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
#endif
#if !defined (TAO_HAS_ZIOP)
-# define TAO_HAS_ZIOP 1
+# if (TAO_HAS_CORBA_MESSAGING == 1)
+// ZIOP needs corba messaging to work
+# define TAO_HAS_ZIOP 1
+# endif
#endif
// Avoid namespace pollution that's common on older UNIXes...