summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-06-10 05:05:48 +0000
committerjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-06-10 05:05:48 +0000
commit0e76b33280ceecc151aa526478f92228feecbc89 (patch)
tree3915051c87f920a5c01f22921cbf5a9d651c3c67
parentca4b1521703f2e7e473933955773b86f023ec34a (diff)
downloadATCD-0e76b33280ceecc151aa526478f92228feecbc89.tar.gz
ChangeLogTag: Sat Jun 10 05:03:58 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
-rw-r--r--TAO/ChangeLog6
-rw-r--r--TAO/configure.ac2
2 files changed, 8 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 6c6e4e34abc..63de7b016ad 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jun 10 05:03:58 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
+
+ * configure.ac:
+
+ Add AM_CONDITIONAL for BUILD_WINNT and BUILD_WXWINDOWS.
+
Sat Jun 10 04:34:32 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
* docs/tutorials/Quoter/AMI/Makefile.am:
diff --git a/TAO/configure.ac b/TAO/configure.ac
index e0b542f0576..39d65bf0b4a 100644
--- a/TAO/configure.ac
+++ b/TAO/configure.ac
@@ -168,6 +168,8 @@ AM_CONDITIONAL(BUILD_REPO, false)
AM_CONDITIONAL(BUILD_THREADS, true)
AM_CONDITIONAL(BUILD_EC_TYPED_EVENTS, true)
AM_CONDITIONAL(BUILD_WFMO, false)
+AM_CONDITIONAL(BUILD_WINNT, false)
+AM_CONDITIONAL(BUILD_WXWINDOWS, false)
ACE_ENABLE_ACEXML
ACE_ENABLE_SSL