ChangeLogTag: Tue Jul 8 16:06:46 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com>

5 files changed, 45 insertions, 10 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index f58b4bcbde0..49e3ea723a4 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,19 @@
+Tue Jul  8 16:06:46 UTC 2008  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * NEWS:
+
+          Document new --enable-rcsid option for autoconf build.
+
+        * m4/ace.m4:
+        * m4/config_h.m4:
+        * m4/platform.m4:
+
+          Add support of a new --enable-rcsid option for the autoconf
+          build.  Previously, compiling RCS IDs into object files was
+          tightly coupled with the --enable-debug option and was always
+          disabled for certain operating systems. A separate option allows
+          the user to select this behavior independently.
+
 Tue Jul  8 14:41:08  2008  Steve Huston  <shuston@riverace.com>
 
         * tests/Reference_Counted_Event_Handler_Test.cpp: Fixed test cases
@@ -24,7 +40,7 @@ Sun Jul  6 18:28:58 UTC 2008  Ken Sedgwick  <ken+5a4@bonsai.com>
           Updated for latest DOC Group release (x.6.6).
           Tracked libACE_Monitor_Control name change.
           Fixed broken patches.
-        
+
 Fri Jul  4 20:11:02 UTC 2008  Steve Huston  <shuston@riverace.com>
 
         * ace/config-macros.h: Don't set ACE_HAS_PROCESS_SPAWN for
@@ -51,15 +67,15 @@ Fri Jul  4 20:11:02 UTC 2008  Steve Huston  <shuston@riverace.com>
 Thu Jul  3 21:42:54 UTC 2008  J.T. Conklin  <jtc@acorntoolworks.com>
 
         * configure.ac:
-        
+
           Changed the feature test used for the existance of the sigval_t
-          type not to define ACE_LACKS_SIGVAL_T if it does not exist.  
-        
+          type not to define ACE_LACKS_SIGVAL_T if it does not exist.
+
           However, it is still needed to set the ac_cv_type_sigval_t shell
           variable, which is used to decide whether to perform the
           ACE_HAS_SIGVAL_SIGVAL_INT and ACE_HAS_SIGVAL_SIGVAL_PTR feature
           tests.
-        
+
           This fixes (the newly reopened) bugzilla #2794.  Thanks to Olli
           Savi for suggesting taking another look.
 
@@ -153,7 +169,7 @@ Mon Jun 30 12:41:00 UTC 2008  Chad Elliott  <elliott_c@ociweb.com>
         * ace/Process.h:
         * ace/Process.cpp:
 
-          Added an option to ACE_Process_Options to use a wchar_t environmet
+          Added an option to ACE_Process_Options to use a wchar_t environment
           buffer instead of char.  This is useful only on Windows with
           ACE_USES_WCHAR undefined.  The benefit of using a wchar_t
           environment buffer is that it is not limited to 32kb as a char
diff --git a/ACE/NEWS b/ACE/NEWS
index 3fcf7b799bd..878c490c4fe 100644
--- a/ACE/NEWS
+++ b/ACE/NEWS
@@ -4,6 +4,9 @@ PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known)
 USER VISIBLE CHANGES BETWEEN ACE-5.6.5 and ACE-5.6.6
 ====================================================
 
+. A new configure option, --enable-rcsid, was added to the autoconf build.
+  This is used to embed RCS IDs in object files.
+
 . A new method was added: void ACE_Time_Value::msec (ACE_UINT64&)
   This method, like the existing msec(ACE_UINT64&)const method, obtains the
   time value in milliseconds and stores it in the passed ACE_UINT64 object.
diff --git a/ACE/m4/ace.m4 b/ACE/m4/ace.m4
index 2643c864bd5..83864201f0a 100644
--- a/ACE/m4/ace.m4
+++ b/ACE/m4/ace.m4
@@ -417,6 +417,26 @@ AC_DEFUN([ACE_CONFIGURATION_OPTIONS],
    esac
   ],)
 
+ AC_ARG_ENABLE([rcsid],
+  AS_HELP_STRING(--enable-rcsid,compile RCS id strings into object files [[[no]]]),
+  [
+   case "${enableval}" in
+    yes)
+      ace_user_enable_rcsid=yes
+      ;;
+    no)
+      ace_user_enable_rcsid=no
+      ;;
+    *)
+      AC_MSG_ERROR([bad value ${enableval} for --enable-rcsid])
+      ;;
+   esac
+  ])
+ if test X$ace_user_enable_rcsid = Xyes; then
+   AC_DEFINE(ACE_USE_RCSID, 1, 
+             [Define to 1 to embed RCS ID strings into compiled object files.])
+ fi
+
  dnl The ace/config-all.h file defaults ACE_NTRACE properly, so only emit
  dnl something if the user specifies this option.
  AC_ARG_ENABLE([trace],
@@ -679,7 +699,6 @@ AC_DEFUN([ACE_COMPILATION_OPTIONS],
       ;;
     no)
       AC_DEFINE([ACE_NDEBUG])
-      AC_DEFINE([ACE_USE_RCSID],[0])
       ;;
     *)
       AC_MSG_ERROR([bad value ${enableval} for --enable-debug])
diff --git a/ACE/m4/config_h.m4 b/ACE/m4/config_h.m4
index e51ef99ed46..573d10fa7fb 100644
--- a/ACE/m4/config_h.m4
+++ b/ACE/m4/config_h.m4
@@ -186,7 +186,6 @@ AH_TEMPLATE([ACE_MALLOC_ALIGN],[])
 AH_TEMPLATE([ACE_MAP_PRIVATE],[])
 AH_TEMPLATE([ACE_THR_PRI_FIFO_DEF],[])
 AH_TEMPLATE([ACE_TIMER_SKEW],[])
-AH_TEMPLATE([ACE_USE_RCSID],[Enable embedding of global RCS ID strings into compiled object file])
 AH_TEMPLATE([IP_ADD_MEMBERSHIP],[])
 AH_TEMPLATE([IP_DROP_MEMBERSHIP],[])
 
diff --git a/ACE/m4/platform.m4 b/ACE/m4/platform.m4
index 9f3041da033..367493e931c 100644
--- a/ACE/m4/platform.m4
+++ b/ACE/m4/platform.m4
@@ -160,7 +160,6 @@ dnl  */
     AC_DEFINE([__NO_INCLUDE_WARN__])
     AC_DEFINE([ACE_MALLOC_ALIGN], [8])
     AC_DEFINE([ACE_MAP_PRIVATE], [ACE_MAP_SHARED])
-    AC_DEFINE([ACE_USE_RCSID], [0])
     AC_DEFINE([ACE_HAS_LYNXOS_SIGNALS])
     AC_DEFINE([ACE_TIMER_SKEW], [(1000 * 10)])
     ;;
@@ -274,7 +273,6 @@ dnl Check for _POSIX_C_SOURCE macro
 #endif
       ], [AC_DEFINE([ACE_DEFAULT_THREAD_KEYS], [16])],[])
     AC_DEFINE([ACE_THR_PRI_FIFO_DEF], [101])
-    AC_DEFINE([ACE_USE_RCSID], [0])
     ;;
   *cygwin32*)
     AC_DEFINE([CYGWIN32])