ChangeLogTag:Mon May 19 11:03:31 2003 Ossama Othman <ossama@dre.vanderbilt.edu>

4 files changed, 47 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 55c4f60c47a..9c359fea93b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Mon May 19 11:03:31 2003  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+	* configure.ac: 
+
+	  Only detect alloca() support if explicitly enabled by the user.
+
+	* bin/make_release:
+
+	  Reenabled bootstrapping of ACE+Autoconf support when creating
+	  ACE beta/release kits.
+
+	* m4/ace.m4 (ACE_CONFIGURATION_OPTIONS):
+
+	  Added "--enable-alloca" configure script option.  alloca()
+	  support will be disabled by support.
+
 Mon May 19 16:08:47 UTC 2003  Don Hinton  <dhinton@dresystems.com>
 
         * tests/CDR_Test.cpp:
diff --git a/bin/make_release b/bin/make_release
index be18ad2d019..0d0e5cf9ba8 100755
--- a/bin/make_release
+++ b/bin/make_release
@@ -756,10 +756,9 @@ sub create_kit () {
   my $build_command;
   my $archives;
 
-  ##### @@ DISABLED UNTIL READY FOR GENERAL USE -- Ossama
   ## Temporary ACE+autoconf hack to bootstrap autoconf support into
   ## ACE distribution.
-  #&ex("cd ACE_wrappers && bin/bootstrap");
+  &ex("cd ACE_wrappers && bin/bootstrap");
 
   if ($kit eq 'ace'  ||  $kit eq 'ace+tao') {
 
diff --git a/configure.ac b/configure.ac
index 390c123cc8c..3888fc4c1d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3199,13 +3199,14 @@ AC_CACHE_SAVE
 
 dnl SECTION 10: checks for library functions
 
-
-AC_FUNC_ALLOCA
-if test "$ac_cv_header_alloca_h" = yes; then
-  AC_DEFINE([ACE_HAS_ALLOCA_H])
-fi
-if test "$ac_cv_func_alloca_works" = yes; then
-  AC_DEFINE([ACE_HAS_ALLOCA])
+if test "$ace_user_enable_alloca" = yes; then
+  AC_FUNC_ALLOCA
+  if test "$ac_cv_header_alloca_h" = yes; then
+    AC_DEFINE([ACE_HAS_ALLOCA_H])
+  fi
+  if test "$ac_cv_func_alloca_works" = yes; then
+    AC_DEFINE([ACE_HAS_ALLOCA])
+  fi
 fi
 
 dnl ACE should really have something for both the sys/mman.h header
@@ -3824,12 +3825,7 @@ dnl End check for SYSV IPC functions
 AC_CHECK_FUNC([read_real_time],
   [AC_DEFINE([ACE_HAS_AIX_HI_RES_TIMER])],)
 
-AC_CHECK_FUNC([shm_open],
-  [
-   AC_MSG_WARN([platform supports shm_open but shm_open support will not be])
-   AC_MSG_WARN([enabled since ACE currently supports it only on LynxOS])
-dnl  AC_DEFINE([ACE_HAS_SHM_OPEN])
-  ],)
+AC_CHECK_FUNC([shm_open], [AC_DEFINE([ACE_HAS_SHM_OPEN])],)
 
 AC_CHECK_FUNC([snprintf],
   [AC_DEFINE([ACE_HAS_SNPRINTF])],)
diff --git a/m4/ace.m4 b/m4/ace.m4
index 7abf1cf87f0..94b1a944eb4 100644
--- a/m4/ace.m4
+++ b/m4/ace.m4
@@ -24,6 +24,27 @@ dnl Macros that add ACE configuration options to a `configure' script.
 dnl ACE_CONFIGURATION_OPTIONS
 AC_DEFUN([ACE_CONFIGURATION_OPTIONS],
 [
+ AC_ARG_ENABLE([alloca],
+  AC_HELP_STRING([--enable-alloca],[compile with alloca() support [[no]]]),
+  [
+   case "${enableval}" in
+    yes)
+      ace_user_enable_alloca=yes
+      ;;
+    no)
+      ace_user_enable_alloca=no
+      ;;
+    *)
+      AC_MSG_ERROR([bad value ${enableval} for --enable-alloca])
+      ;;
+   esac
+  ],
+  [
+   dnl Disable alloca() support by default since its use is generally
+   dnl not recommended.
+   ace_user_enable_alloca=no
+  ])
+
  AC_ARG_ENABLE([log-msg-prop],
   AC_HELP_STRING([--enable-log-msg-prop],[enable threads inheriting ACE_Log_Msg properties from parent thread [[yes]]]),
   [