summaryrefslogtreecommitdiff
path: root/ACE/m4
diff options
context:
space:
mode:
authorjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-07-08 16:09:00 +0000
committerjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-07-08 16:09:00 +0000
commitc3d370af6dfa2c15a9d753575e52c7926fd076b4 (patch)
tree314fd5437af0d4d815388885998f8253f422cf76 /ACE/m4
parent64a4ae5535ab999168b5925529cd8f56352e733f (diff)
downloadATCD-c3d370af6dfa2c15a9d753575e52c7926fd076b4.tar.gz
ChangeLogTag: Tue Jul 8 16:06:46 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'ACE/m4')
-rw-r--r--ACE/m4/ace.m421
-rw-r--r--ACE/m4/config_h.m41
-rw-r--r--ACE/m4/platform.m42
3 files changed, 20 insertions, 4 deletions
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])