diff options
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/configure.ac | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 112f8605f29..461ee578755 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Sun Nov 14 14:26:18 2004 J.T. Conklin <jtc@acorntoolworks.com> + + * configure.ac: + + Changed to use ACE_WITH_ACEXML macro instead of setting + BUILD_ACEXML automake conditional to true. + Sun Nov 14 21:57:38 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> * tests/Bug_1535_Regression/Bug_1535_Regression.mpc: diff --git a/TAO/configure.ac b/TAO/configure.ac index a12255134bf..2d69eef0a6e 100644 --- a/TAO/configure.ac +++ b/TAO/configure.ac @@ -149,8 +149,9 @@ AC_SUBST([TAO_MAJOR]) AC_SUBST([TAO_MINOR]) AC_SUBST([TAO_BETA]) +dnl We should have --with/--enable flags for these options. +dnl Until we do, set them to reasonable defaults. AM_CONDITIONAL(TEMPLATES_REQUIRE_SOURCE, false) - AM_CONDITIONAL(BUILD_RT_CORBA, true) AM_CONDITIONAL(BUILD_CORBA_MESSAGING, true) AM_CONDITIONAL(BUILD_MINIMUM_CORBA, false) @@ -158,7 +159,8 @@ AM_CONDITIONAL(BUILD_INTERCEPTORS, true) AM_CONDITIONAL(BUILD_ACE_UUID, true) AM_CONDITIONAL(BUILD_AMI, true) AM_CONDITIONAL(BUILD_SSL, false) -AM_CONDITIONAL(BUILD_ACEXML, true) + +ACE_WITH_ACEXML dnl |