summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-11-24 13:27:12 +0000
committerjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-11-24 13:27:12 +0000
commita660d778db0db126295ea1d87b0f47341f46f2c8 (patch)
treea8e0f036e3987be5219779d3f768a461bcada370
parent798034b34f55b26a7ba1ff68e489bd07bbadcd68 (diff)
downloadATCD-a660d778db0db126295ea1d87b0f47341f46f2c8.tar.gz
ChangeLogTag: Fri Nov 24 13:21:52 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
-rw-r--r--TAO/ChangeLog8
-rw-r--r--TAO/configure.ac2
2 files changed, 10 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 33f0eed07a0..36d3fb2ca0f 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Fri Nov 24 13:21:52 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
+
+ * configure.ac:
+
+ Added AM_CONDITIONAL for BUILD_STL and BUILD_BOOST, so we can
+ generate Makefile.am's with these options. Default to false,
+ until we can write feature tests for these options.
+
Fri Nov 24 13:21:00 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
* orbsvcs/orbsvcs/Makefile.am:
diff --git a/TAO/configure.ac b/TAO/configure.ac
index 121b35fa944..9c137b3f1c8 100644
--- a/TAO/configure.ac
+++ b/TAO/configure.ac
@@ -170,6 +170,8 @@ AM_CONDITIONAL(BUILD_EC_TYPED_EVENTS, true)
AM_CONDITIONAL(BUILD_WFMO, false)
AM_CONDITIONAL(BUILD_WINNT, false)
AM_CONDITIONAL(BUILD_WXWINDOWS, false)
+AM_CONDITIONAL(BUILD_STL, false)
+AM_CONDITIONAL(BUILD_BOOST, false)
ACE_ENABLE_ACEXML
ACE_ENABLE_SSL