ChangeLogTag:Tue Jan 7 22:59:05 2003 Ossama Othman <ossama@uci.edu>

6 files changed, 124 insertions, 36 deletions

diff --git a/ChangeLog b/ChangeLog
index b0571dcff30..4e52e0cc8e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+Tue Jan  7 22:59:05 2003  Ossama Othman  <ossama@uci.edu>
+
+	* configure.ac:
+
+	  Enable Libtool and Automake support.
+
+	* bin/bootstrap:
+
+	  Call `libtoolize' to add libtool support files to the ACE
+	  distribution.
+
+	* m4/config_h.m4:
+
+	  Added ACE_LACKS_ACE_CODECS macro template (for the sake of
+	  completeness).
+
+	* m4/subsets.m4:
+
+	  Added support for "--enable-lib-codecs" configure script
+	  option.
+
 Wed Jan  1 10:28:27 2003  Ossama Othman  <ossama@uci.edu>
 
 	* configure.ac:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index b0571dcff30..4e52e0cc8e6 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,24 @@
+Tue Jan  7 22:59:05 2003  Ossama Othman  <ossama@uci.edu>
+
+	* configure.ac:
+
+	  Enable Libtool and Automake support.
+
+	* bin/bootstrap:
+
+	  Call `libtoolize' to add libtool support files to the ACE
+	  distribution.
+
+	* m4/config_h.m4:
+
+	  Added ACE_LACKS_ACE_CODECS macro template (for the sake of
+	  completeness).
+
+	* m4/subsets.m4:
+
+	  Added support for "--enable-lib-codecs" configure script
+	  option.
+
 Wed Jan  1 10:28:27 2003  Ossama Othman  <ossama@uci.edu>
 
 	* configure.ac:
diff --git a/bin/bootstrap b/bin/bootstrap
index 2c6dd32de23..5ab87392a12 100755
--- a/bin/bootstrap
+++ b/bin/bootstrap
@@ -139,6 +139,9 @@ if test -d m4; then
     automake --add-missing #--verbose
 #   fi
 
+#   Make sure libtool support files are available.
+    libtoolize --automake
+
 #   # Generate the man pages.
 #   # Only generate man pages if bootstrapping a release.
 #   if test $bootstrap_release = yes; then
diff --git a/configure.ac b/configure.ac
index 071e6a7b64a..feea1b27b05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -110,7 +110,7 @@ dnl Set the test language as C++
 AC_LANG([C++])
 
 dnl If we are cross compiling disable certain things in the Makefiles.
-dnl AM_CONDITIONAL(ACE_CROSS_COMPILED, test X$cross_compiling = Xyes)dnl
+AM_CONDITIONAL(ACE_CROSS_COMPILED, test X$cross_compiling = Xyes)dnl
 
 
 dnl This checks for a binary called gm4, gnum4 or m4, and assigns
@@ -293,7 +293,7 @@ dnl Athena widget set.
 
   AC_SUBST([XTREACTOR_TEST_XLIBS])
 
-dnl   AM_CONDITIONAL([COMPILE_XTREACTOR_TEST],[test X$xt_reactor_go = Xyes])
+dnl  AM_CONDITIONAL([COMPILE_XTREACTOR_TEST],[test X$xt_reactor_go = Xyes])
 
 dnl Restore pre-test linker flags
   LDFLAGS="$T_LDFLAGS"
@@ -365,7 +365,7 @@ dnl save_CC="$CC"
 dnl CC="$CXX"
 
 dnl Check for libtool and turn on Automake processing for Libtool
-dnl AC_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 
 dnl Enable C++ support in libtool
 dnl AC_LIBTOOL_CXX
@@ -1749,7 +1749,7 @@ if test "$cross_compiling" != yes; then
   dnl   AC_DEFINE([ACE_SIZEOF_CHAR],[SIZEOF_CHAR])
   dnl fi
   AC_CHECK_SIZEOF([short])
-  if test $ac_cv_sizeof_short != 0; then
+  if test "$ac_cv_sizeof_short" != 0; then
     AC_DEFINE_UNQUOTED([ACE_SIZEOF_SHORT],[$ac_cv_sizeof_short])
   fi
   AC_CHECK_SIZEOF([int])
@@ -1813,6 +1813,8 @@ if test "$cross_compiling" != yes; then
   if test $ac_cv_sizeof_signed_char = 0; then
    AC_DEFINE([ACE_LACKS_SIGNED_CHAR])
   fi
+else
+  ace_u_long_long_typedef_set=no
 fi dnl test "$cross_compiling" != yes
 
 dnl Other checks
@@ -6321,7 +6323,7 @@ dnl since gethrtime.cpp uses assembler code specific to that compiler.
   [
    AC_DEFINE([ACE_HAS_PENTIUM])
   ],)
-dnl AM_CONDITIONAL(ACE_ON_PENTIUM, test X$ace_cv_feature_pentium = Xyes)
+AM_CONDITIONAL(ACE_ON_PENTIUM, test X$ace_cv_feature_pentium = Xyes)
 
 
 dnl
@@ -7186,6 +7188,8 @@ AC_CONFIG_FILES([
   ace-config
   ace-config.1
   aceConf.sh
+  Makefile
+  ace/Makefile
 ])
 
 AC_CONFIG_COMMANDS([default],[
diff --git a/m4/config_h.m4 b/m4/config_h.m4
index 2dc0b8cbc27..cec5ee65614 100644
--- a/m4/config_h.m4
+++ b/m4/config_h.m4
@@ -1000,6 +1000,9 @@ AH_TEMPLATE([ACE_LACKS_ACE_IOSTREAM],
 [Platform can not build ace/IOStream{,_T}.cpp.  This does not
    necessarily mean that the platform does not support iostreams.])
 
+AH_TEMPLATE([ACE_LACKS_ACE_CODECS],
+[Do not compile support for the "Codecs" ACE features.])
+
 AH_TEMPLATE([ACE_LACKS_ACE_OTHER],
 [Do not compile support for the "other" ACE features, such as CORBA
    handling, name services, and QoS.])
diff --git a/m4/subsets.m4 b/m4/subsets.m4
index 66409ecf477..69a6fe5274e 100644
--- a/m4/subsets.m4
+++ b/m4/subsets.m4
@@ -317,6 +317,26 @@ 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]),
+              [
+               case "${enableval}" in
+                yes)
+                  ACE_CREATE_LIBACE_CODECS
+                  ;;
+                no)
+                  ace_user_enable_lib_codecs=no
+                  AC_DEFINE([ACE_LACKS_ACE_CODECS])
+                  ;;
+                *)
+                  AC_MSG_ERROR([bad value ${enableval} for --enable-lib-codecs])
+                  ;;
+               esac
+
+               dnl Disable full ACE library build
+               ace_user_enable_lib_full=no
+              ],)
+
 AC_ARG_ENABLE([lib-other],
      AC_HELP_STRING([--enable-lib-other],[build ACE_Other library]),
               [
@@ -364,6 +384,7 @@ if test $ace_user_enable_lib_full = 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_other = no; then
 
   dnl If we get here then no ACE libraries will be built!
@@ -372,50 +393,53 @@ if test $ace_user_enable_lib_full = no &&
 fi  dnl No components will be built!
 
 dnl Set which ACE subsets to build
-dnl AM_CONDITIONAL(BUILD_OS_FILES,
-dnl                test X$ace_user_enable_lib_os = Xyes)
+AM_CONDITIONAL(BUILD_OS_FILES,
+               test X$ace_user_enable_lib_os = Xyes)
 
-dnl AM_CONDITIONAL(BUILD_UTILS_FILES,
-dnl                test X$ace_user_enable_lib_utils = Xyes)
+AM_CONDITIONAL(BUILD_UTILS_FILES,
+               test X$ace_user_enable_lib_utils = Xyes)
 
-dnl AM_CONDITIONAL(BUILD_LOGGING_FILES,
-dnl                test X$ace_user_enable_lib_logging = Xyes)
+AM_CONDITIONAL(BUILD_LOGGING_FILES,
+               test X$ace_user_enable_lib_logging = Xyes)
 
-dnl AM_CONDITIONAL(BUILD_THREADS_FILES,
-dnl                test X$ace_user_enable_lib_threads = Xyes)
+AM_CONDITIONAL(BUILD_THREADS_FILES,
+               test X$ace_user_enable_lib_threads = Xyes)
 
-dnl AM_CONDITIONAL(BUILD_DEMUX_FILES,
-dnl                test X$ace_user_enable_lib_demux = Xyes)
+AM_CONDITIONAL(BUILD_DEMUX_FILES,
+               test X$ace_user_enable_lib_demux = Xyes)
 
-dnl AM_CONDITIONAL(BUILD_CONNECTION_FILES,
-dnl                test X$ace_user_enable_lib_connection = Xyes)
+AM_CONDITIONAL(BUILD_CONNECTION_FILES,
+               test X$ace_user_enable_lib_connection = Xyes)
 
-dnl AM_CONDITIONAL(BUILD_SOCKETS_FILES,
-dnl                test X$ace_user_enable_lib_sockets = Xyes)
+AM_CONDITIONAL(BUILD_SOCKETS_FILES,
+               test X$ace_user_enable_lib_sockets = Xyes)
 
-dnl AM_CONDITIONAL(BUILD_IPC_FILES,
-dnl                test X$ace_user_enable_lib_ipc = Xyes)
+AM_CONDITIONAL(BUILD_IPC_FILES,
+               test X$ace_user_enable_lib_ipc = Xyes)
 
-dnl AM_CONDITIONAL(BUILD_SVCCONF_FILES,
-dnl                test X$ace_user_enable_lib_svcconf = Xyes)
+AM_CONDITIONAL(BUILD_SVCCONF_FILES,
+               test X$ace_user_enable_lib_svcconf = Xyes)
 
-dnl AM_CONDITIONAL(BUILD_STREAMS_FILES,
-dnl                test X$ace_user_enable_lib_streams = Xyes)
+AM_CONDITIONAL(BUILD_STREAMS_FILES,
+               test X$ace_user_enable_lib_streams = Xyes)
 
-dnl AM_CONDITIONAL(BUILD_MEMORY_FILES,
-dnl                test X$ace_user_enable_lib_memory = Xyes)
+AM_CONDITIONAL(BUILD_MEMORY_FILES,
+               test X$ace_user_enable_lib_memory = Xyes)
 
-dnl AM_CONDITIONAL(BUILD_TIMER_FILES,
-dnl                test X$ace_user_enable_lib_timer = Xyes)
+AM_CONDITIONAL(BUILD_TIMER_FILES,
+               test X$ace_user_enable_lib_timer = Xyes)
 
-dnl AM_CONDITIONAL(BUILD_TOKEN_FILES,
-dnl                test X$ace_user_enable_lib_token = Xyes)
+AM_CONDITIONAL(BUILD_TOKEN_FILES,
+               test X$ace_user_enable_lib_token = Xyes)
 
-dnl AM_CONDITIONAL(BUILD_OTHER_FILES,
-dnl                test X$ace_user_enable_lib_other = Xyes)
+AM_CONDITIONAL(BUILD_CODECS_FILES,
+               test X$ace_user_enable_lib_codecs = Xyes)
 
-dnl AM_CONDITIONAL(BUILD_FULL_LIBRARY,
-dnl                test X$ace_user_enable_lib_full = Xyes)
+AM_CONDITIONAL(BUILD_OTHER_FILES,
+               test X$ace_user_enable_lib_other = Xyes)
+
+AM_CONDITIONAL(BUILD_FULL_LIBRARY,
+               test X$ace_user_enable_lib_full = Xyes)
 
 dnl End ACE_CHECK_SUBSETS
 ])
@@ -567,7 +591,17 @@ AC_DEFUN([ACE_CREATE_LIBACE_TOKEN],
  dnl ACE_CREATE_LIBACE_OTHER
 ])
 
-dnl Set the component dependencies for the libACE_Utils library
+dnl Set the component dependencies for the libACE_Codecs library
+dnl Usage: ACE_CREATE_LIBACE_CODECS
+AC_DEFUN([ACE_CREATE_LIBACE_CODECS],
+[
+ ace_user_enable_lib_codecs=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_Other library
 dnl Usage: ACE_CREATE_LIBACE_OTHER
 AC_DEFUN([ACE_CREATE_LIBACE_OTHER],
 [
@@ -605,6 +639,7 @@ AC_DEFUN([ACE_CREATE_ALL_COMPONENTS],
  ace_user_enable_lib_memory=yes
  ace_user_enable_lib_timer=yes
  ace_user_enable_lib_token=yes
+ ace_user_enable_lib_codecs=yes
  ace_user_enable_lib_other=yes
 ])
 
@@ -625,5 +660,6 @@ AC_DEFUN([ACE_DISABLE_ALL_COMPONENTS],
  ace_user_enable_lib_memory=no
  ace_user_enable_lib_timer=no
  ace_user_enable_lib_token=no
+ ace_user_enable_lib_codecs=no
  ace_user_enable_lib_other=no
 ])