summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2001-01-08 01:05:25 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2001-01-08 01:05:25 +0000
commit058abe79beb524ba16e067b724aa31193b6d9dd4 (patch)
tree615e32cbb5fecae39b24d5ae1a0b9f3c096818f2
parent7d771dfea264a57245043d16e019b9057e6e146e (diff)
downloadATCD-058abe79beb524ba16e067b724aa31193b6d9dd4.tar.gz
ChangeLogTag:Sun Jan 7 17:04:57 2001 Ossama Othman <ossama@uci.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a8
-rw-r--r--TAO/rules.tao.GNU3
2 files changed, 11 insertions, 0 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index e74a521fc56..2efe27cea78 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,11 @@
+Sun Jan 7 17:04:57 2001 Ossama Othman <ossama@uci.edu>
+
+ * rules.tao.GNU:
+
+ Disable interceptor support if minimum CORBA is enabled. This
+ fixes portable interceptor related build errors in minimum CORBA
+ builds.
+
Sun Jan 7 16:05:54 2001 Ossama Othman <ossama@uci.edu>
* tests/Portable_Interceptors/ForwardRequest/client.bor
diff --git a/TAO/rules.tao.GNU b/TAO/rules.tao.GNU
index 55116107cb3..b0820c17da6 100644
--- a/TAO/rules.tao.GNU
+++ b/TAO/rules.tao.GNU
@@ -63,6 +63,9 @@ ifeq ($(minimum_corba),1)
ifndef ami
ami = 0
endif # ! ami
+ ifndef interceptors
+ interceptors = 0
+ endif # ! interceptors
CPPFLAGS += -DTAO_HAS_MINIMUM_CORBA=1
else # minimum_corba
override minimum_corba = 0