diff options
Diffstat (limited to 'TAO/configure.ac')
-rw-r--r-- | TAO/configure.ac | 71 |
1 files changed, 2 insertions, 69 deletions
diff --git a/TAO/configure.ac b/TAO/configure.ac index c3a870bd5eb..44fbdabdd0d 100644 --- a/TAO/configure.ac +++ b/TAO/configure.ac @@ -45,8 +45,8 @@ AC_CONFIG_MACRO_DIR([../m4]) dnl Check what platform we are running on. AC_CANONICAL_TARGET([]) -dnl Initialize GNU Automake, and require Automake 1.9 or better. -AM_INIT_AUTOMAKE([1.9]) +dnl Initialize GNU Automake, and require Automake 1.7 or better. +AM_INIT_AUTOMAKE([1.7]) dnl Add maintainer mode option to the option list. @@ -151,14 +151,6 @@ AC_SUBST([TAO_BETA]) AM_CONDITIONAL(TEMPLATES_REQUIRE_SOURCE, false) -AM_CONDITIONAL(BUILD_RT_CORBA, true) -AM_CONDITIONAL(BUILD_CORBA_MESSAGING, true) -AM_CONDITIONAL(BUILD_MINIMUM_CORBA, false) -AM_CONDITIONAL(BUILD_INTERCEPTORS, true) -AM_CONDITIONAL(BUILD_ACE_UUID, true) -AM_CONDITIONAL(BUILD_AMI, true) -AM_CONDITIONAL(BUILD_SSL, false) - dnl dnl SECTION 16: AC_CONFIG_FILES([FILE...]) @@ -203,65 +195,6 @@ AC_CONFIG_FILES([ orbsvcs/Time_Service/Makefile orbsvcs/Trading_Service/Makefile orbsvcs/orbsvcs/Makefile - orbsvcs/performance-tests/Makefile - orbsvcs/performance-tests/LoadBalancing/Makefile - orbsvcs/performance-tests/LoadBalancing/LBPerf/Makefile - orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile - orbsvcs/performance-tests/RTEvent/Makefile - orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile - orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile - orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile - orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile - orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile - orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile - orbsvcs/performance-tests/RTEvent/lib/Makefile - orbsvcs/tests/Makefile - orbsvcs/tests/AVStreams/Makefile - orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile - orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile - orbsvcs/tests/AVStreams/Component_Switching/Makefile - orbsvcs/tests/AVStreams/Full_Profile/Makefile - orbsvcs/tests/AVStreams/Latency/Makefile - orbsvcs/tests/AVStreams/Modify_QoS/Makefile - orbsvcs/tests/AVStreams/Multicast/Makefile - orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile - orbsvcs/tests/AVStreams/Multiple_Flows/Makefile - orbsvcs/tests/AVStreams/Pluggable/Makefile - orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile - orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile - orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile - orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile - orbsvcs/tests/Bug_1334_Regression/Makefile - orbsvcs/tests/Bug_1393_Regression/Makefile - orbsvcs/tests/Bug_1395_Regression/Makefile - orbsvcs/tests/Bug_1630_Regression/Makefile - orbsvcs/tests/Concurrency/Makefile - orbsvcs/tests/CosEvent/Makefile - orbsvcs/tests/CosEvent/Basic/Makefile - orbsvcs/tests/CosEvent/lib/Makefile - orbsvcs/tests/EC_Custom_Marshal/Makefile - orbsvcs/tests/EC_MT_Mcast/Makefile - orbsvcs/tests/EC_Mcast/Makefile - orbsvcs/tests/EC_Multiple/Makefile - orbsvcs/tests/EC_Throughput/Makefile - orbsvcs/tests/Event/Makefile - orbsvcs/tests/Event/Basic/Makefile - orbsvcs/tests/Event/Mcast/Makefile - orbsvcs/tests/Event/Mcast/Common/Makefile - orbsvcs/tests/Event/Mcast/Complex/Makefile - orbsvcs/tests/Event/Mcast/Simple/Makefile - orbsvcs/tests/Event/Mcast/Two_Way/Makefile - orbsvcs/tests/Event/Performance/Makefile - orbsvcs/tests/Event/lib/Makefile - orbsvcs/tests/FT_App/Makefile - orbsvcs/tests/FaultTolerance/Makefile - orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile - orbsvcs/tests/FaultTolerance/IOGR/Makefile - orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile - orbsvcs/tests/FtRtEvent/Makefile - utils/Makefile - utils/catior/Makefile - utils/nslist/Makefile ]) dnl Note that the "TAO_VERSION" in the message below is an M4 macro |