ChangeLogTag:Sun Feb 6 20:44:26 2000 Ossama Othman <ossama@uci.edu>

5 files changed, 45 insertions, 19 deletions

diff --git a/ace-config.1.in b/ace-config.1.in
index 99b93e9545a..0fe88bb087d 100644
--- a/ace-config.1.in
+++ b/ace-config.1.in
@@ -52,6 +52,6 @@ Additional ACE related library configuration information.
 .SH BUGS
 None.
 .SH AUTHOR
-Ossama Othman <othman@cs.wustl.edu>
+Ossama Othman <ossama@uci.edu>
 .SH "SEE ALSO"
 .BR tao-config (1)
diff --git a/configure.in b/configure.in
index ae455039882..38b79597e46 100644
--- a/configure.in
+++ b/configure.in
@@ -444,13 +444,12 @@ AC_ARG_ENABLE(purify,
                   AC_CHECK_PROG(PURIFY, purify, purify,)
                   if test -n "$PURIFY"; then
                     PURE_CACHE_BASE_DIR=/tmp/purifycache
-                    PURE_CACHE_DIR=${PURE_CACHE_BASE_DIR}-${LOGNAME}-${notdir ${CXX} }
-                    PURELINK="$PURIFY -best-effort -chain-length=20 \
-             -cache-dir=$PURE_CACHE_DIR \
-             -fds-inuse-at-exit=no -ignore-signals=SIGINT -inuse-at-exit \
-             -max_threads=100"
-                    ACE_CXXFLAGS="$ACE_CXXFLAGS -DACE_HAS_PURIFY"
-                    ACE_CFLAGS="$ACE_CFLAGS -DACE_HAS_PURIFY"
+                    PURE_CACHE_DIR="${PURE_CACHE_BASE_DIR}-${LOGNAME}"
+                    PURE_CACHE_DIR="${PURE_CACHE_DIR}-"`basename $CXX`
+                    PURELINK="$PURIFY -best-effort -chain-length=20 -cache-dir=$PURE_CACHE_DIR -fds-inuse-at-exit=no -inuse-at-exit -max_threads=100"
+                    dnl Pick up Quantify directory from the users PATH.
+		    ACE_PURIFY_DIR=`type purify | sed -e 's/.* is //' -e 's%/purify'`
+                    ACE_CPPFLAGS="-DACE_HAS_PURIFY -I$ACE_PURIFY_DIR"
                   else
                     AC_MSG_WARN(Purify program was not found.)
                     AC_MSG_WARN(Disabling purify support.)
@@ -473,11 +472,13 @@ AC_ARG_ENABLE(quantify,
                   AC_CHECK_PROG(QUANTIFY, quantify, quantify,)
                   if test -n "$QUANTIFY"; then
                     PURE_CACHE_BASE_DIR=/tmp/purifycache
-                    PURE_CACHE_DIR=${PURE_CACHE_BASE_DIR}-${LOGNAME}-${notdir ${CXX} }
-                    PRELINK="$QUANTIFY  -best-effort -max_threads=100 \
-             -cache-dir=$PURE_CACHE_DIR"
-                    ACE_CXXFLAGS="$ACE_CXXFLAGS -DACE_HAS_QUANTIFY"
-                    ACE_CFLAGS="$ACE_CFLAGS -DACE_HAS_QUANTIFY"
+                    PURE_CACHE_DIR="${PURE_CACHE_BASE_DIR}-${LOGNAME}"
+                    PURE_CACHE_DIR="${PURE_CACHE_DIR}-"`basename $CXX`
+
+                    PRELINK="$QUANTIFY -best-effort -max_threads=100 -cache-dir=$PURE_CACHE_DIR"
+                    dnl Pick up Quantify directory from the users PATH.
+		    ACE_QUANTIFY_DIR=`type quantify | sed -e 's/.* is //' -e 's%/quantify$$%%'`
+                    ACE_CPPFLAGS="-DACE_HAS_QUANTIFY -I$ACE_QUANTIFY_DIR"
                   else
                     AC_MSG_WARN(Quantify program was not found.)
                     AC_MSG_WARN(Disabling quantify support.)
@@ -792,9 +793,6 @@ case "$target" in
   *freebsd*)
     LIBS="$LIBS -lcompat"
     ;;
-  *hpux9* | *hpux1[01]*)
-    LIBS="$LIBS -lcma -lrt"
-    ;;
   *osf3.2*)
     LIBS="$LIBS -lmach -lsys5 -lcxx -lc -lrt"
     ;;
@@ -7441,7 +7439,7 @@ ACE_CACHE_CHECK(if generated ACE configuration is usable,
 The generated configuration appears to be unusable.  Please verify
 that your system path and environment variables are correct.  If they
 appear to be correct then please send the maintainer of this configure
-script Ossama Othman <othman@cs.wustl.edu> the \`config.log' file and
+script Ossama Othman <ossama@ece.uci.edu> the \`config.log' file and
 the following information:
 
   ACE \`configure' Script Information
diff --git a/m4/compiler.m4 b/m4/compiler.m4
index 85c3563968b..b4db61fc364 100644
--- a/m4/compiler.m4
+++ b/m4/compiler.m4
@@ -179,9 +179,11 @@ changequote([, ])dnl
          ;;
        aCC)
          CXXFLAGS="$CXXFLAGS"
-         ACE_CXXFLAGS="$ACE_CXXFLAGS +W829,302"
+         ACE_CXXFLAGS="$ACE_CXXFLAGS +W302,495,667,829"
          DCXXFLAGS="-g"
          OCXXFLAGS=""
+         WERROR="+We67"
+         # Warning 67: Invalid pragma name -- needed for ACE_LACKS_PRAGMA_ONCE
          ;;
        *)
          if test -n "$GXX"; then
@@ -262,6 +264,10 @@ changequote([, ])dnl
          if (CC -V 2>&1 | egrep 'Compilers 5\.0' > /dev/null); then
            CXXFLAGS="$CXXFLAGS -library=iostream,no%Cstd -instances=explicit"
 
+           dnl Inlining appears to cause link problems with early
+           dnl releases of CC 5.0.
+	   AC_DEFINE(ACE_LACKS_INLINE_FUNCTIONS)
+
            if test "$ace_user_enable_exceptions" != yes; then
              dnl See /opt/SUNWspro_5.0/SC5.0/include/CC/stdcomp.h.
              AC_DEFINE(_RWSTD_NO_EXCEPTIONS)
diff --git a/m4/features.m4 b/m4/features.m4
index 2b605a29a27..2817698a83f 100644
--- a/m4/features.m4
+++ b/m4/features.m4
@@ -406,7 +406,7 @@ query_aio_completions (void)
       // Wait for <milli_seconds> amount of time.
       // @@ Assigning <milli_seconds> to tv_sec.
       timespec timeout;
-      timeout.tv_sec = INT_MAX;
+      timeout.tv_sec = 5;
       timeout.tv_nsec = 0;
   
       // To get back the signal info.
diff --git a/m4/threads.m4 b/m4/threads.m4
index ed9d8db0702..e6633662325 100644
--- a/m4/threads.m4
+++ b/m4/threads.m4
@@ -37,6 +37,23 @@ dnl  AC_REQUIRE([AC_LANG_CPLUSPLUS])
  ACE_CACHE_CHECK(if compiler may need a thread flag,
    ace_cv_feature_may_need_thread_flag,
    [
+    ifelse(AC_LANG, [CPLUSPLUS],
+      [ace_save_CXXFLAGS="$CXXFLAGS"
+       case "$target" in
+         *solaris2*)
+           dnl Sun C++ 4.2/5.0 weirdness
+           dnl Sun C++ 4.2/5.0 links a thread function stub library in
+           dnl the single threaded case, which causes the link test in
+           dnl ACE_CHECK_THREAD_FLAGS to pass.
+           if (CC -V 2>&1 | egrep 'Compilers 4\.2' > /dev/null) \
+              || (CC -V 2>&1 | egrep 'Compilers 5\.0' > /dev/null); then
+             CXXFLAGS="-xnolib"
+           fi
+           ;;
+       esac
+      ],
+      [ace_save_CFLAGS="$CFLAGS"])
+
     ACE_CHECK_THREAD_FLAGS(
       [
        ace_cv_feature_may_need_thread_flag=no
@@ -44,6 +61,11 @@ dnl  AC_REQUIRE([AC_LANG_CPLUSPLUS])
       [
        ace_cv_feature_may_need_thread_flag=yes
       ])
+    dnl Reset the flags to a consistent state.
+    dnl This prevents duplicate flags from being added to
+    dnl the C/CXXFLAGS variable.
+    ifelse(AC_LANG, [CPLUSPLUS],
+           [CXXFLAGS="$ace_save_CXXFLAGS"],[CFLAGS="$ace_save_CFLAGS"])
    ],
    [
     dnl The compiler/platform has no thread support linked in by default