ChangeLogTag: Fri Jan 27 02:41:12 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>

5 files changed, 95 insertions, 12 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 9166e8e2556..6184ca96a0c 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,13 +1,32 @@
+Fri Jan 27 02:41:12 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * Makefile.am:
+        * orbsvcs/Makefile.am:
+
+          Use BUILD_EXAMPLES AND BUILD_TESTS automake conditionals to
+          control whether TAO's (and TAO's ORBservice's) examples and
+          tests are built.
+
+        * configure.ac:
+
+          Invoke TAO_ENABLE_EXAMPLES and TAO_ENABLE_TESTS.
+
+        * m4/tao.m4:
+
+          Added TAO_ENABLE_EXAMPLES and TAO_ENABLE_TESTS autoconf macros.
+          These enable/disable BUILD_EXAMPLES and BUILD_TESTS automake
+          conditionals.
+
 Thu Jan 26 20:36:47 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * orbsvcs/IFR_Service/be_produce.cpp(BE_cleanup):
-        
+
           Removed code to destory the temporary holding scope entry in
           the repository after each IDL file is processed. Instead the
           lifetime of that entry is now tied to the repository itself.
-          
+
         * orbsvcs/IFR_Service/ifr_adding_visitor.cpp (visit_typedef):
-        
+
           Removed code that replaces a typedef with the same repo id
           with a new entry, which would invalidate any references to
           the typedef entry that other entries may hold. The IFR will
@@ -17,12 +36,12 @@ Thu Jan 26 20:36:47 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
           <richard dot spence dot extern at icn dot siemens dot de>
           for reporting the problem when the typdef is used as an
           operation parameter. This closes [BUGID:2381].
-          
+
         * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp (name_exists):
-        
+
           Changed the loop to be a FOR loop using the explicit section
           names, rather than a while loop calling enumerate_sections()
-          to get each section name. 
+          to get each section name.
 
 Thu Jan 26 15:37:12 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
diff --git a/TAO/Makefile.am b/TAO/Makefile.am
index 3a9628ad79e..534cb5db6d1 100644
--- a/TAO/Makefile.am
+++ b/TAO/Makefile.am
@@ -18,10 +18,20 @@ SUBDIRS = \
         TAO_IDL \
         tao \
 	orbsvcs \
-	examples \
-        docs \
+        docs
+
+if BUILD_EXAMPLES
+SUBDIRS += \
+	examples
+endif
+
+if BUILD_TESTS
+SUBDIRS += \
 	performance-tests \
-	interop-tests \
+	interop-tests
+endif
+
+SUBDIRS += \
 	utils
 
 ## For some reason, automake doesn't include acconfig.h in the distribution
diff --git a/TAO/configure.ac b/TAO/configure.ac
index fdb5de8047e..2bf55b25d83 100644
--- a/TAO/configure.ac
+++ b/TAO/configure.ac
@@ -176,6 +176,9 @@ ACE_ENABLE_QT_REACTOR
 ACE_ENABLE_TK_REACTOR
 ACE_ENABLE_XT_REACTOR
 
+TAO_ENABLE_EXAMPLES
+TAO_ENABLE_TESTS
+
 
 dnl
 dnl SECTION 16: AC_CONFIG_FILES([FILE...])
diff --git a/TAO/m4/tao.m4 b/TAO/m4/tao.m4
index 3faa51981fd..1441e8b5316 100644
--- a/TAO/m4/tao.m4
+++ b/TAO/m4/tao.m4
@@ -42,3 +42,47 @@ tao_user_enable_minimum_corba=no
 AM_CONDITIONAL([BUILD_MINIMUM_CORBA], 
 	       [test X$tao_user_enable_minimum_corba = Xyes])
 ])
+
+AC_DEFUN([TAO_ENABLE_EXAMPLES],
+[AC_ARG_ENABLE([tao-examples],
+               AS_HELP_STRING([--enable-tao-examples],
+                              [build TAO examples [[[yes]]]]),
+[
+case "${enableval}" in
+  yes)
+    tao_build_examples=yes
+    ;;
+  no)
+    tao_build_examples=no
+    ;;
+  *)
+    AC_MSG_ERROR([bad value ${enableval} for --enable-tao-examples])
+    ;;
+esac
+],[
+tao_build_examples=yes
+])
+AM_CONDITIONAL([BUILD_EXAMPLES], [test X$tao_build_examples = Xyes])
+])
+
+AC_DEFUN([TAO_ENABLE_TESTS],
+[AC_ARG_ENABLE([tao-tests],
+               AS_HELP_STRING([--enable-tao-tests],
+			      [build TAO tests [[[yes]]]]),
+[
+case "${enableval}" in
+  yes)
+    tao_build_tests=yes
+    ;;
+  no)
+    tao_build_tests=no
+    ;;
+  *)
+    AC_MSG_ERROR([bad value ${enableval} for --enable-tao-tests])
+    ;;
+esac
+],[
+tao_build_tests=yes
+])
+AM_CONDITIONAL([BUILD_TESTS], [test X$tao_build_tests = Xyes])
+])
diff --git a/TAO/orbsvcs/Makefile.am b/TAO/orbsvcs/Makefile.am
index f079ecca777..3aaa8bc1ab5 100644
--- a/TAO/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/Makefile.am
@@ -28,8 +28,15 @@ SUBDIRS = \
         Event_Service \
         Dump_Schedule \
         CosEvent_Service \
-        Concurrency_Service \
-        performance-tests \
-        tests \
+        Concurrency_Service
+
+if BUILD_EXAMPLES
+SUBDIRS += \
         examples
+endif
 
+if BUILD_TESTS
+SUBDIRS += \
+        performance-tests \
+        tests
+endif