ChangeLogTag:Tue Mar 25 08:22:03 2003 Ossama Othman <ossama@uci.edu>

4 files changed, 26 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 3fe2f0d3c2e..9a47a91b7cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Tue Mar 25 08:22:03 2003  Ossama Othman  <ossama@uci.edu>
+
+	* m4/ace.m4:
+	* m4/compiler.m4:
+	* m4/platform.m4:
+
+	  Applied Steve's change below to the remaining 'test -n/-z
+	  "$GXX"' instances.  Addresses some problems in non-GNU compiler
+	  builds.
+
 Fri Mar 21 23:17:26 2003  Steve Huston  <shuston@riverace.com>
 
 	* configure.ac: Changed <test -n "$GXX"> to <test "$GXX" = yes> to
diff --git a/m4/ace.m4 b/m4/ace.m4
index b731ee793e3..b9134daf333 100644
--- a/m4/ace.m4
+++ b/m4/ace.m4
@@ -400,7 +400,7 @@ AC_DEFUN([ACE_COMPILATION_OPTIONS],
       ;;
     no)
       ace_user_enable_exceptions=no
-      if test -n "$GXX"; then
+      if test "$GXX" = yes; then
 dnl Temporarily change M4 quotes to prevent "regex []" from being eaten
 changequote(, )dnl
         if $CXX --version | egrep -v '^2\.[0-7]' > /dev/null; then
@@ -420,7 +420,7 @@ changequote([, ])dnl
 dnl THE FOLLOWING WAS ONLY USED WHEN DISABLING EXCEPTION SUPPORT BY
 dnl DEFAULT.
 dnl
-dnl    if test -n "$GXX"; then
+dnl    if test "$GXX" = yes; then
 dnl dnl Temporarily change M4 quotes to prevent "regex []" from being eaten
 dnl changequote(, )dnl
 dnl      if $CXX --version | egrep -v '^2\.[0-7]' > /dev/null; then
@@ -587,7 +587,7 @@ dnl    fi
   [
    case "${enableval}" in
     yes)
-      if test -n "$GXX"; then
+      if test "$GXX" = yes; then
         ace_user_enable_repo=yes
         ACE_CXXFLAGS="$ACE_CXXFLAGS -frepo"
         AC_DEFINE(ACE_HAS_GNU_REPO)
@@ -613,7 +613,7 @@ dnl    fi
   [
    case "${enableval}" in
     yes)
-      if test -z "$GXX"; then
+      if test "$GXX" = no; then
         case "$host" in
           *solaris*)
                ace_user_enable_rtti=yes
diff --git a/m4/compiler.m4 b/m4/compiler.m4
index ab45d22b038..25458a06e38 100644
--- a/m4/compiler.m4
+++ b/m4/compiler.m4
@@ -37,7 +37,7 @@ dnl  AC_BEFORE([$0], [AM_PROG_LIBTOOL])
 
  AC_REQUIRE([ACE_COMPILATION_OPTIONS])
 
- if test -n "$GXX"; then
+ if test "$GXX" = yes; then
 dnl Temporarily change M4 quotes to prevent "regex []" from being eaten
 changequote(, )dnl
    if $CXX --version | egrep -v '^2\.[0-7]' > /dev/null; then
@@ -75,7 +75,7 @@ changequote([, ])dnl
  dnl                user override them.
  dnl    WERROR    - Compiler flag that converts warnings to errors
 
- if test -n "$GXX"; then
+ if test "$GXX" = yes; then
     WERROR="-Werror"
  fi
 
@@ -128,7 +128,7 @@ changequote([, ])dnl
          CPPFLAGS="$CPPFLAGS -qlanglvl=ansi"
          ;;
        *)
-         if test -n "$GXX"; then
+         if test "$GXX" = yes; then
            ACE_CXXFLAGS="-mcpu=common"
          fi
          ;;
@@ -143,7 +143,7 @@ changequote([, ])dnl
          OCXXFLAGS="-qarch=ppc -qtune=604"
          ;;
        *)
-         if test -n "$GXX"; then
+         if test "$GXX" = yes; then
            ACE_CXXFLAGS="-mcpu=common"
          fi
          ;;
@@ -162,7 +162,7 @@ changequote([, ])dnl
          OCXXFLAGS=""
          ;;
        *)
-         if test -n "$GXX"; then
+         if test "$GXX" = yes; then
            ACE_CXXFLAGS="$ACE_CXXFLAGS"
          fi
          ;;
@@ -171,7 +171,7 @@ changequote([, ])dnl
    *freebsd*)
      case "$CXX" in
        *)
-         if test -n "$GXX"; then       
+         if test "$GXX" = yes; then       
            CXXFLAGS="$CXXFLAGS"
            ACE_CXXFLAGS="$ACE_CXXFLAGS -w -fno-strict-prototypes"
            DCXXFLAGS=""
@@ -232,7 +232,7 @@ changequote([, ])dnl
          fi
          ;;
        *)
-         if test -n "$GXX"; then
+         if test "$GXX" = yes; then
            ACE_CXXFLAGS="$ACE_CXXFLAGS -w"
          fi
          ;;
@@ -264,7 +264,7 @@ changequote([, ])dnl
    *linux*)
      case "$CXX" in
        *)
-         if test -n "$GXX"; then
+         if test "$GXX" = yes; then
            CXXFLAGS="$CXXFLAGS"
            ACE_CXXFLAGS="$ACE_CXXFLAGS"
            DCXXFLAGS="$DCXXFLAGS"
@@ -342,14 +342,14 @@ changequote([, ])dnl
  esac
 
  dnl Additional flags
- if test -n "$GXX"; then
+ if test "$GXX" = yes; then
    ACE_CXXFLAGS="$ACE_CXXFLAGS -W -Wall -Wpointer-arith"
 dnl    if test "$ace_user_enable_repo" = no; then
 dnl      ACE_CXXFLAGS="$ACE_CXXFLAGS -fno-implicit-templates"
 dnl    fi
  fi
 
- if test -n "$GCC"; then
+ if test "$GCC" = yes; then
    ACE_CFLAGS="$ACE_CFLAGS -W -Wall -Wpointer-arith"
  fi
 ])
diff --git a/m4/platform.m4 b/m4/platform.m4
index 54373dc1ef0..392cf57959f 100644
--- a/m4/platform.m4
+++ b/m4/platform.m4
@@ -119,7 +119,7 @@ dnl FIXME: "FSU" isn't a platform!  We need to move this somewhere.
     ;;
   *irix5.3*)
     AC_DEFINE([IRIX5])
-    if test -z "$GXX"; then
+    if test "$GXX" = no; then
       ACE_CPPFLAGS="$ACE_CPPFLAGS -D_BSD_TYPES"
     fi
     ;;
@@ -307,7 +307,7 @@ dnl    AC_DEFINE(ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL)
 changequote(, )dnl
       i[3456]86*)
 changequote([, ])dnl
-        if test -n "$GXX"; then
+        if test "$GXX" = yes; then
           # Neutrino defines memcpy as a macro on x86, which then
           # hoses the ACE_OS::memcpy() method.  Undefining
           # __OPTIMIZE__ prevents this from happening.