ChangeLogTag:Mon Jun 28 16:34:29 2004 Steve Huston <shuston@riverace.com>

2 files changed, 204 insertions, 93 deletions

diff --git a/m4/config_h.m4 b/m4/config_h.m4
index 54f8bfe8641..6feeec67351 100644
--- a/m4/config_h.m4
+++ b/m4/config_h.m4
@@ -975,6 +975,9 @@ AH_TEMPLATE([ACE_LACKS_ACE_SVCCONF],
 AH_TEMPLATE([ACE_LACKS_ACE_TOKEN],
 [Do not compile support for the ACE Token feature.])
 
+AH_TEMPLATE([ACE_LACKS_ACE_UUID],
+[Do not compile support for the ACE UUID feature.])
+
 AH_TEMPLATE([ACE_LACKS_COND_T],
 [Platform lacks condition variables (e.g., Win32 and VxWorks)])
 
@@ -1344,6 +1347,9 @@ AH_TEMPLATE([ACE_LACKS_WCSTOD],
 AH_TEMPLATE([ACE_LACKS_WCSTOK],
 [Platform lacks wcstok()])
 
+AH_TEMPLATE([ACE_HAS_3_PARAM_WCSTOK],
+[Platform's wcstok() takes 3 arguments])
+
 AH_TEMPLATE([ACE_LACKS_WCSTOL],
 [Platform lacks wcstol()])
 
diff --git a/m4/subsets.m4 b/m4/subsets.m4
index 9ec654be377..276a204278f 100644
--- a/m4/subsets.m4
+++ b/m4/subsets.m4
@@ -86,18 +86,19 @@ AC_ARG_ENABLE([lib-os],
                ace_user_enable_lib_full=no
               ],)
 
-AC_ARG_ENABLE([lib-utils],
-     AC_HELP_STRING([--enable-lib-utils],[build ACE_Utils library]),
+AC_ARG_ENABLE([lib-codecs],
+     AC_HELP_STRING([--enable-lib-codecs],[build ACE_Codecs library]),
               [
                case "${enableval}" in
                 yes)
-                  ACE_CREATE_LIBACE_UTILS
+                  ACE_CREATE_LIBACE_CODECS
                   ;;
                 no)
-                  ace_user_enable_lib_utils=no
+                  ace_user_enable_lib_codecs=no
+                  AC_DEFINE([ACE_LACKS_ACE_CODECS])
                   ;;
                 *)
-                  AC_MSG_ERROR([bad value ${enableval} for --enable-lib-utils])
+                  AC_MSG_ERROR([bad value ${enableval} for --enable-lib-codecs])
                   ;;
                esac
 
@@ -105,18 +106,18 @@ AC_ARG_ENABLE([lib-utils],
                ace_user_enable_lib_full=no
               ],)
 
-AC_ARG_ENABLE([lib-logging],
-     AC_HELP_STRING([--enable-lib-logging],[build ACE_Logging library]),
+AC_ARG_ENABLE([lib-connection],
+     AC_HELP_STRING([--enable-lib-connection],[build ACE_Connection library ]),
               [
                case "${enableval}" in
                 yes)
-                  ACE_CREATE_LIBACE_LOGGING
+                  ACE_CREATE_LIBACE_CONNECTION
                   ;;
                 no)
-                  ace_user_enable_lib_logging=no
+                  ace_user_enable_lib_connection=no
                   ;;
                 *)
-                  AC_MSG_ERROR([bad value ${enableval} for --enable-lib-logging])
+                  AC_MSG_ERROR([bad value ${enableval} for --enable-lib-connection])
                   ;;
                esac
 
@@ -124,18 +125,18 @@ AC_ARG_ENABLE([lib-logging],
                ace_user_enable_lib_full=no
               ],)
 
-AC_ARG_ENABLE([lib-threads],
-     AC_HELP_STRING([--enable-lib-threads],[build ACE_Threads library]),
+AC_ARG_ENABLE([lib-demux],
+     AC_HELP_STRING([--enable-lib-demux],[build ACE_Demux library]),
               [
                case "${enableval}" in
                 yes)
-                  ACE_CREATE_LIBACE_THREADS
+                  ACE_CREATE_LIBACE_DEMUX
                   ;;
                 no)
-                  ace_user_enable_lib_threads=no
+                  ace_user_enable_lib_demux=no
                   ;;
                 *)
-                  AC_MSG_ERROR([bad value ${enableval} for --enable-lib-threads])
+                  AC_MSG_ERROR([bad value ${enableval} for --enable-lib-demux])
                   ;;
                esac
 
@@ -143,18 +144,18 @@ AC_ARG_ENABLE([lib-threads],
                ace_user_enable_lib_full=no
               ],)
 
-AC_ARG_ENABLE([lib-demux],
-     AC_HELP_STRING([--enable-lib-demux],[build ACE_Demux library]),
+AC_ARG_ENABLE([lib-filecache],
+     AC_HELP_STRING([--enable-lib-filecache],[build ACE_Filecache library]),
               [
                case "${enableval}" in
                 yes)
-                  ACE_CREATE_LIBACE_DEMUX
+                  ACE_CREATE_LIBACE_FILECACHE
                   ;;
                 no)
-                  ace_user_enable_lib_demux=no
+                  ace_user_enable_lib_filecache=no
                   ;;
                 *)
-                  AC_MSG_ERROR([bad value ${enableval} for --enable-lib-demux])
+                  AC_MSG_ERROR([bad value ${enableval} for --enable-lib-filecache])
                   ;;
                esac
 
@@ -162,18 +163,18 @@ AC_ARG_ENABLE([lib-demux],
                ace_user_enable_lib_full=no
               ],)
 
-AC_ARG_ENABLE([lib-connection],
-     AC_HELP_STRING([--enable-lib-connection],[build ACE_Connection library ]),
+AC_ARG_ENABLE([lib-ipc],
+     AC_HELP_STRING([--enable-lib-ipc],[build ACE_IPC library]),
               [
                case "${enableval}" in
                 yes)
-                  ACE_CREATE_LIBACE_CONNECTION
+                  ACE_CREATE_LIBACE_IPC
                   ;;
                 no)
-                  ace_user_enable_lib_connection=no
+                  ace_user_enable_lib_ipc=no
                   ;;
                 *)
-                  AC_MSG_ERROR([bad value ${enableval} for --enable-lib-connection])
+                  AC_MSG_ERROR([bad value ${enableval} for --enable-lib-ipc])
                   ;;
                esac
 
@@ -181,18 +182,18 @@ AC_ARG_ENABLE([lib-connection],
                ace_user_enable_lib_full=no
               ],)
 
-AC_ARG_ENABLE([lib-sockets],
-     AC_HELP_STRING([--enable-lib-sockets],[build ACE_Sockets library]),
+AC_ARG_ENABLE([lib-logging],
+     AC_HELP_STRING([--enable-lib-logging],[build ACE_Logging library]),
               [
                case "${enableval}" in
                 yes)
-                  ACE_CREATE_LIBACE_SOCKETS
+                  ACE_CREATE_LIBACE_LOGGING
                   ;;
                 no)
-                  ace_user_enable_lib_sockets=no
+                  ace_user_enable_lib_logging=no
                   ;;
                 *)
-                  AC_MSG_ERROR([bad value ${enableval} for --enable-lib-sockets])
+                  AC_MSG_ERROR([bad value ${enableval} for --enable-lib-logging])
                   ;;
                esac
 
@@ -200,18 +201,18 @@ AC_ARG_ENABLE([lib-sockets],
                ace_user_enable_lib_full=no
               ],)
 
-AC_ARG_ENABLE([lib-ipc],
-     AC_HELP_STRING([--enable-lib-ipc],[build ACE_IPC library]),
+AC_ARG_ENABLE([lib-memory],
+     AC_HELP_STRING([--enable-lib-memory],[build ACE_Memory library]),
               [
                case "${enableval}" in
                 yes)
-                  ACE_CREATE_LIBACE_IPC
+                  ACE_CREATE_LIBACE_MEMORY
                   ;;
                 no)
-                  ace_user_enable_lib_ipc=no
+                  ace_user_enable_lib_memory=no
                   ;;
                 *)
-                  AC_MSG_ERROR([bad value ${enableval} for --enable-lib-ipc])
+                  AC_MSG_ERROR([bad value ${enableval} for --enable-lib-memory])
                   ;;
                esac
 
@@ -219,19 +220,37 @@ AC_ARG_ENABLE([lib-ipc],
                ace_user_enable_lib_full=no
               ],)
 
-AC_ARG_ENABLE([lib-svcconf],
-     AC_HELP_STRING([--enable-lib-svcconf],[build ACE_Svcconf library]),
+AC_ARG_ENABLE([lib-metrics],
+     AC_HELP_STRING([--enable-lib-metrics],[build ACE_Metrics library]),
               [
                case "${enableval}" in
                 yes)
-                  ACE_CREATE_LIBACE_SVCCONF
+                  ACE_CREATE_LIBACE_METRICS
                   ;;
                 no)
-                  ace_user_enable_lib_svcconf=no
-                  AC_DEFINE([ACE_LACKS_ACE_SVCCONF])
+                  ace_user_enable_lib_metrics=no
                   ;;
                 *)
-                  AC_MSG_ERROR([bad value ${enableval} for --enable-lib-svcconf])
+                  AC_MSG_ERROR([bad value ${enableval} for --enable-lib-metrics])
+                  ;;
+               esac
+
+               dnl Disable full ACE library build
+               ace_user_enable_lib_full=no
+              ],)
+
+AC_ARG_ENABLE([lib-sockets],
+     AC_HELP_STRING([--enable-lib-sockets],[build ACE_Sockets library]),
+              [
+               case "${enableval}" in
+                yes)
+                  ACE_CREATE_LIBACE_SOCKETS
+                  ;;
+                no)
+                  ace_user_enable_lib_sockets=no
+                  ;;
+                *)
+                  AC_MSG_ERROR([bad value ${enableval} for --enable-lib-sockets])
                   ;;
                esac
 
@@ -258,18 +277,19 @@ AC_ARG_ENABLE([lib-streams],
                ace_user_enable_lib_full=no
               ],)
 
-AC_ARG_ENABLE([lib-memory],
-     AC_HELP_STRING([--enable-lib-memory],[build ACE_Memory library]),
+AC_ARG_ENABLE([lib-svcconf],
+     AC_HELP_STRING([--enable-lib-svcconf],[build ACE_Svcconf library]),
               [
                case "${enableval}" in
                 yes)
-                  ACE_CREATE_LIBACE_MEMORY
+                  ACE_CREATE_LIBACE_SVCCONF
                   ;;
                 no)
-                  ace_user_enable_lib_memory=no
+                  ace_user_enable_lib_svcconf=no
+                  AC_DEFINE([ACE_LACKS_ACE_SVCCONF])
                   ;;
                 *)
-                  AC_MSG_ERROR([bad value ${enableval} for --enable-lib-memory])
+                  AC_MSG_ERROR([bad value ${enableval} for --enable-lib-svcconf])
                   ;;
                esac
 
@@ -277,6 +297,24 @@ AC_ARG_ENABLE([lib-memory],
                ace_user_enable_lib_full=no
               ],)
 
+AC_ARG_ENABLE([lib-threads],
+     AC_HELP_STRING([--enable-lib-threads],[build ACE_Threads library]),
+              [
+               case "${enableval}" in
+                yes)
+                  ACE_CREATE_LIBACE_THREADS
+                  ;;
+                no)
+                  ace_user_enable_lib_threads=no
+                  ;;
+                *)
+                  AC_MSG_ERROR([bad value ${enableval} for --enable-lib-threads])
+                  ;;
+               esac
+
+               dnl Disable full ACE library build
+               ace_user_enable_lib_full=no
+              ],)
 
 AC_ARG_ENABLE([lib-timer],
      AC_HELP_STRING([--enable-lib-timer],[build ACE_Timer library]),
@@ -317,19 +355,38 @@ AC_ARG_ENABLE([lib-token],
                ace_user_enable_lib_full=no
               ],)
 
-AC_ARG_ENABLE([lib-codecs],
-     AC_HELP_STRING([--enable-lib-codecs],[build ACE_Codecs library]),
+AC_ARG_ENABLE([lib-utils],
+     AC_HELP_STRING([--enable-lib-utils],[build ACE_Utils library]),
               [
                case "${enableval}" in
                 yes)
-                  ACE_CREATE_LIBACE_CODECS
+                  ACE_CREATE_LIBACE_UTILS
                   ;;
                 no)
-                  ace_user_enable_lib_codecs=no
-                  AC_DEFINE([ACE_LACKS_ACE_CODECS])
+                  ace_user_enable_lib_utils=no
                   ;;
                 *)
-                  AC_MSG_ERROR([bad value ${enableval} for --enable-lib-codecs])
+                  AC_MSG_ERROR([bad value ${enableval} for --enable-lib-utils])
+                  ;;
+               esac
+
+               dnl Disable full ACE library build
+               ace_user_enable_lib_full=no
+              ],)
+
+AC_ARG_ENABLE([lib-uuid],
+     AC_HELP_STRING([--enable-lib-uuid],[build ACE_UUID library]),
+              [
+               case "${enableval}" in
+                yes)
+                  ACE_CREATE_LIBACE_UUID
+                  ;;
+                no)
+                  ace_user_enable_lib_uuid=no
+                  AC_DEFINE([ACE_LACKS_ACE_UUID])
+                  ;;
+                *)
+                  AC_MSG_ERROR([bad value ${enableval} for --enable-lib-uuid])
                   ;;
                esac
 
@@ -372,19 +429,22 @@ fi
 
 if test $ace_user_enable_lib_full = no &&
    test $ace_user_enable_lib_os = no &&
-   test $ace_user_enable_lib_utils = no &&
+   test $ace_user_enable_lib_codecs = no &&
+   test $ace_user_enable_lib_connection = no &&
+   test $ace_user_enable_lib_demux = no &&
+   test $ace_user_enable_lib_filecache = no &&
+   test $ace_user_enable_lib_ipc = no &&
    test $ace_user_enable_lib_logging = no &&
+   test $ace_user_enable_lib_memory = no &&
+   test $ace_user_enable_lib_metrics = no &&
    test $ace_user_enable_lib_threads = no &&
-   test $ace_user_enable_lib_demux = no &&
-   test $ace_user_enable_lib_connection = no &&
    test $ace_user_enable_lib_sockets = no &&
-   test $ace_user_enable_lib_ipc = no &&
    test $ace_user_enable_lib_svcconf = no &&
    test $ace_user_enable_lib_streams = no &&
-   test $ace_user_enable_lib_memory = no &&
    test $ace_user_enable_lib_timer = no &&
    test $ace_user_enable_lib_token = no &&
-   test $ace_user_enable_lib_codecs = no &&
+   test $ace_user_enable_lib_utils = no &&
+   test $ace_user_enable_lib_uuid = no &&
    test $ace_user_enable_lib_other = no; then
 
   dnl If we get here then no ACE libraries will be built!
@@ -396,35 +456,41 @@ dnl Set which ACE subsets to build
 AM_CONDITIONAL(BUILD_OS_FILES,
                test X$ace_user_enable_lib_os = Xyes)
 
-AM_CONDITIONAL(BUILD_UTILS_FILES,
-               test X$ace_user_enable_lib_utils = Xyes)
-
-AM_CONDITIONAL(BUILD_LOGGING_FILES,
-               test X$ace_user_enable_lib_logging = Xyes)
+AM_CONDITIONAL(BUILD_CODECS_FILES,
+               test X$ace_user_enable_lib_codecs = Xyes)
 
-AM_CONDITIONAL(BUILD_THREADS_FILES,
-               test X$ace_user_enable_lib_threads = Xyes)
+AM_CONDITIONAL(BUILD_CONNECTION_FILES,
+               test X$ace_user_enable_lib_connection = Xyes)
 
 AM_CONDITIONAL(BUILD_DEMUX_FILES,
                test X$ace_user_enable_lib_demux = Xyes)
 
-AM_CONDITIONAL(BUILD_CONNECTION_FILES,
-               test X$ace_user_enable_lib_connection = Xyes)
-
-AM_CONDITIONAL(BUILD_SOCKETS_FILES,
-               test X$ace_user_enable_lib_sockets = Xyes)
+AM_CONDITIONAL(BUILD_FILECACHE_FILES,
+               test X$ace_user_enable_lib_filecache = Xyes)
 
 AM_CONDITIONAL(BUILD_IPC_FILES,
                test X$ace_user_enable_lib_ipc = Xyes)
 
-AM_CONDITIONAL(BUILD_SVCCONF_FILES,
-               test X$ace_user_enable_lib_svcconf = Xyes)
+AM_CONDITIONAL(BUILD_LOGGING_FILES,
+               test X$ace_user_enable_lib_logging = Xyes)
+
+AM_CONDITIONAL(BUILD_MEMORY_FILES,
+               test X$ace_user_enable_lib_memory = Xyes)
+
+AM_CONDITIONAL(BUILD_METRICS_FILES,
+               test X$ace_user_enable_lib_metrics = Xyes)
+
+AM_CONDITIONAL(BUILD_SOCKETS_FILES,
+               test X$ace_user_enable_lib_sockets = Xyes)
 
 AM_CONDITIONAL(BUILD_STREAMS_FILES,
                test X$ace_user_enable_lib_streams = Xyes)
 
-AM_CONDITIONAL(BUILD_MEMORY_FILES,
-               test X$ace_user_enable_lib_memory = Xyes)
+AM_CONDITIONAL(BUILD_SVCCONF_FILES,
+               test X$ace_user_enable_lib_svcconf = Xyes)
+
+AM_CONDITIONAL(BUILD_THREADS_FILES,
+               test X$ace_user_enable_lib_threads = Xyes)
 
 AM_CONDITIONAL(BUILD_TIMER_FILES,
                test X$ace_user_enable_lib_timer = Xyes)
@@ -432,8 +498,11 @@ AM_CONDITIONAL(BUILD_TIMER_FILES,
 AM_CONDITIONAL(BUILD_TOKEN_FILES,
                test X$ace_user_enable_lib_token = Xyes)
 
-AM_CONDITIONAL(BUILD_CODECS_FILES,
-               test X$ace_user_enable_lib_codecs = Xyes)
+AM_CONDITIONAL(BUILD_UTILS_FILES,
+               test X$ace_user_enable_lib_utils = Xyes)
+
+AM_CONDITIONAL(BUILD_UUID_FILES,
+               test X$ace_user_enable_lib_uuid = Xyes)
 
 AM_CONDITIONAL(BUILD_OTHER_FILES,
                test X$ace_user_enable_lib_other = Xyes)
@@ -461,8 +530,28 @@ AC_DEFUN([ACE_CREATE_LIBACE_UTILS],
  ACE_CREATE_LIBACE_OS
 ])
 
+dnl Set the component dependencies for the libACE_UUID library
+dnl Usage: ACE_CREATE_LIBACE_UUID
+AC_DEFUN([ACE_CREATE_LIBACE_UUID],
+[
+ ace_user_enable_lib_uuid=yes
+
+ dnl Be careful not to go into a circular/recursive loop with these macros!
+ ACE_CREATE_LIBACE_OS
+])
+
+dnl Set the component dependencies for the libACE_Filecache library
+dnl Usage: ACE_CREATE_LIBACE_FILECACHE
+AC_DEFUN([ACE_CREATE_LIBACE_FILECACHE],
+[
+ ace_user_enable_lib_filecache=yes
+
+ dnl Be careful not to go into a circular/recursive loop with these macros!
+ ACE_CREATE_LIBACE_OS
+])
+
 dnl Set the component dependencies for the libACE_Logging library
-dnl Usage: ACE_CREATE_LIBACE_Logging
+dnl Usage: ACE_CREATE_LIBACE_LOGGING
 AC_DEFUN([ACE_CREATE_LIBACE_LOGGING],
 [
  ace_user_enable_lib_logging=yes
@@ -471,6 +560,16 @@ AC_DEFUN([ACE_CREATE_LIBACE_LOGGING],
  ACE_CREATE_LIBACE_OS
 ])
 
+dnl Set the component dependencies for the libACE_Metrics library
+dnl Usage: ACE_CREATE_LIBACE_METRICS
+AC_DEFUN([ACE_CREATE_LIBACE_METRICS],
+[
+ ace_user_enable_lib_metrics=yes
+
+ dnl Be careful not to go into a circular/recursive loop with these macros!
+ ACE_CREATE_LIBACE_OS
+])
+
 dnl Set the component dependencies for the libACE_Threads library
 dnl Usage: ACE_CREATE_LIBACE_THREADS
 AC_DEFUN([ACE_CREATE_LIBACE_THREADS],
@@ -627,19 +726,22 @@ dnl Usage: ACE_CREATE_ALL_COMPONENTS
 AC_DEFUN([ACE_CREATE_ALL_COMPONENTS],
 [
  ace_user_enable_lib_os=yes
- ace_user_enable_lib_utils=yes
- ace_user_enable_lib_logging=yes
- ace_user_enable_lib_threads=yes
- ace_user_enable_lib_demux=yes
+ ace_user_enable_lib_codecs=yes
  ace_user_enable_lib_connection=yes
- ace_user_enable_lib_sockets=yes
+ ace_user_enable_lib_demux=yes
+ ace_user_enable_lib_filecache=yes
  ace_user_enable_lib_ipc=yes
- ace_user_enable_lib_svcconf=yes
- ace_user_enable_lib_streams=yes
+ ace_user_enable_lib_logging=yes
  ace_user_enable_lib_memory=yes
+ ace_user_enable_lib_metrics=yes
+ ace_user_enable_lib_sockets=yes
+ ace_user_enable_lib_streams=yes
+ ace_user_enable_lib_svcconf=yes
+ ace_user_enable_lib_threads=yes
  ace_user_enable_lib_timer=yes
  ace_user_enable_lib_token=yes
- ace_user_enable_lib_codecs=yes
+ ace_user_enable_lib_utils=yes
+ ace_user_enable_lib_uuid=yes
  ace_user_enable_lib_other=yes
 ])
 
@@ -648,18 +750,21 @@ dnl Usage: ACE_CREATE_ALL_COMPONENTS
 AC_DEFUN([ACE_DISABLE_ALL_COMPONENTS],
 [
  ace_user_enable_lib_os=no
- ace_user_enable_lib_utils=no
- ace_user_enable_lib_logging=no
- ace_user_enable_lib_threads=no
- ace_user_enable_lib_demux=no
+ ace_user_enable_lib_codecs=no
  ace_user_enable_lib_connection=no
- ace_user_enable_lib_sockets=no
+ ace_user_enable_lib_demux=no
+ ace_user_enable_lib_filecache=no
  ace_user_enable_lib_ipc=no
- ace_user_enable_lib_svcconf=no
- ace_user_enable_lib_streams=no
+ ace_user_enable_lib_logging=no
  ace_user_enable_lib_memory=no
+ ace_user_enable_lib_metrics=no
+ ace_user_enable_lib_sockets=no
+ ace_user_enable_lib_streams=no
+ ace_user_enable_lib_svcconf=no
+ ace_user_enable_lib_threads=no
  ace_user_enable_lib_timer=no
  ace_user_enable_lib_token=no
- ace_user_enable_lib_codecs=no
+ ace_user_enable_lib_utils=no
+ ace_user_enable_lib_uuid=no
  ace_user_enable_lib_other=no
 ])