From d04e20e91b58c53174472b8ceeb8df7e065d84b1 Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Wed, 25 Nov 2009 17:36:27 +0000
Subject: [PATCH] Remove SOURCE_C*FLAG definitions. Use COMPILER_C*FLAGS
 instead.

---
 configure/CONFIG_COMMON                                 | 8 ++------
 configure/os/CONFIG.linux-x86-borland.linux-x86-borland | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON
index 49ec15aa7..e882697ee 100644
--- a/configure/CONFIG_COMMON
+++ b/configure/CONFIG_COMMON
@@ -196,10 +196,6 @@ OP_SYS_CXXFLAGS = $(OP_SYS_CFLAGS)
 OP_SYS_LDFLAGS =
 OP_SYS_INCLUDES =
 
-# SOURCE* used by WIN32 only
-SOURCE_CFLAG =
-SOURCE_CXXCFLAG =
-
 # Makefile specific flags
 USR_INCLUDES =
 USR_CFLAGS =
@@ -310,8 +306,8 @@ LEXOPT += -I
 # Build compile line here
 
 PATH_FILTER = $(1)
-COMPILE.c = $(CC) -c $(CPPFLAGS) $(CFLAGS) $(call PATH_FILTER,$(INCLUDES)) $(SOURCE_FLAG)
-COMPILE.cpp = $(CCC) -c $(CPPFLAGS) $(CXXFLAGS) $(call PATH_FILTER,$(INCLUDES)) $(SOURCE_CXXFLAG)
+COMPILE.c = $(CC) -c $(CPPFLAGS) $(CFLAGS) $(call PATH_FILTER,$(INCLUDES))
+COMPILE.cpp = $(CCC) -c $(CPPFLAGS) $(CXXFLAGS) $(call PATH_FILTER,$(INCLUDES))
 
 #--------------------------------------------------
 # C preprocessor command
diff --git a/configure/os/CONFIG.linux-x86-borland.linux-x86-borland b/configure/os/CONFIG.linux-x86-borland.linux-x86-borland
index e4c20303e..5e116ba39 100644
--- a/configure/os/CONFIG.linux-x86-borland.linux-x86-borland
+++ b/configure/os/CONFIG.linux-x86-borland.linux-x86-borland
@@ -118,7 +118,7 @@ OBJ=.o
 
 #       Problem: BorlandC does not recognize  *.cc as C++ source,
 #       we have to compile xx.cc  using the flag -P xx.cc,
-SOURCE_CXXFLAG = -P
+COMPILER_CXXFLAGS = -P
 
 #	Operating system flags 
 OP_SYS_CFLAGS =