From d483c7c807bb78da1654feb86a76bd34ee0f4fac Mon Sep 17 00:00:00 2001
From: Michael Ow <mow@svn.icu-project.org>
Date: Thu, 7 Oct 2010 03:34:53 +0000
Subject: [PATCH] ICU-7721 Check to see if both CXXFLAGS and CFLAGS were not
 set already.

X-SVN-Rev: 28770
---
 icu4c/source/configure    | 8 +++++++-
 icu4c/source/configure.in | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/icu4c/source/configure b/icu4c/source/configure
index cca42d0dd18..89fddbe292e 100755
--- a/icu4c/source/configure
+++ b/icu4c/source/configure
@@ -3843,10 +3843,16 @@ if test "$GCC" = yes; then
     if test "$CFLAGS" = ""; then
         if test "$ENABLE_DEBUG" = 1; then
             CFLAGS=-g
-            CXXFLAGS=-g
         fi
         if test "$ENABLE_RELEASE" = 1; then
             CFLAGS="$CFLAGS -O2"
+        fi
+    fi
+    if test "$CXXFLAGS" = ""; then
+        if test "$ENABLE_DEBUG" = 1; then
+            CXXFLAGS=-g
+        fi
+        if test "$ENABLE_RELEASE" = 1; then
             CXXFLAGS="$CXXFLAGS -O2"
         fi
     fi
diff --git a/icu4c/source/configure.in b/icu4c/source/configure.in
index 6b01d0f7966..107912b041d 100644
--- a/icu4c/source/configure.in
+++ b/icu4c/source/configure.in
@@ -120,10 +120,16 @@ if test "$GCC" = yes; then
     if test "$CFLAGS" = ""; then
         if test "$ENABLE_DEBUG" = 1; then
             CFLAGS=-g
-            CXXFLAGS=-g
         fi
         if test "$ENABLE_RELEASE" = 1; then
             CFLAGS="$CFLAGS -O2"
+        fi
+    fi
+    if test "$CXXFLAGS" = ""; then
+        if test "$ENABLE_DEBUG" = 1; then
+            CXXFLAGS=-g
+        fi
+        if test "$ENABLE_RELEASE" = 1; then
             CXXFLAGS="$CXXFLAGS -O2"
         fi
     fi