From 18919400180bec93e50cb943fb02a91f3c5ed1de Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Thu, 10 Apr 1997 21:32:42 +0000
Subject: [PATCH] compile C++ only if CPLUSPLUS isnt empty

---
 config/CONFIG_BASE | 51 +++++++++++++++++++++++++---------------------
 config/CONFIG_SITE |  5 +++--
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/config/CONFIG_BASE b/config/CONFIG_BASE
index df020c81d..330fc4363 100644
--- a/config/CONFIG_BASE
+++ b/config/CONFIG_BASE
@@ -8,29 +8,34 @@
 # for c++ build add the dirs gdd and cas after ca
 # (and uncomment the c++ files in src/lbCom/Makefile.Unix)
 #
-DIRS = \
-    tools \
-    include \
-    cxxTemplates \
-    toolsComm\
-    libCom \
-    libvxWorks\
-    cvtDctsdr \
-    dbStatic \
-    db \
-    bpt \
-    ca \
-    util \
-    misc \
-    sequencer \
-    dbtools \
-    rsrv\
-    rec\
-    as \
-    drv\
-    dev\
-    devOpt\
-    iocCore
+DIRS = tools 
+DIRS += include 
+DIRS += cxxTemplates 
+DIRS += toolsComm
+DIRS += libCom 
+DIRS += libvxWorks
+DIRS += cvtDctsdr 
+DIRS += dbStatic 
+DIRS += db 
+DIRS += bpt 
+DIRS += ca 
+DIRS += util 
+DIRS += misc 
+DIRS += sequencer 
+DIRS += dbtools 
+DIRS += rsrv
+DIRS += rec
+DIRS += as 
+DIRS += drv
+DIRS += dev
+DIRS += devOpt
+DIRS += iocCore
+
+#
+# if CPLUSPLUS isnt empty then include C++ src codes
+#
+DIRS += $(patsubst %,gdd,$(strip $(CPLUSPLUS)))
+DIRS += $(patsubst %,cas,$(strip $(CPLUSPLUS)))
 
 EPICS_BASE = $(TOP)
 
diff --git a/config/CONFIG_SITE b/config/CONFIG_SITE
index 05693406a..b595a18ce 100644
--- a/config/CONFIG_SITE
+++ b/config/CONFIG_SITE
@@ -76,10 +76,11 @@ ANSI=ACC
 #STANDARD=HPCC
 STANDARD=ACC
  
-#  Client C++ Compiler (Not supported yet)
+#  C++ Compiler 
 #   G++     (g++)   GNU C++
-#   CCC     (CC)    SUN C++
+#   CCC     (CC)    OS VENDOR C++
 #CPLUSPLUS=G++
+#CPLUSPLUS=	# use this if site does not have C++ compiler
 CPLUSPLUS=CCC
 
 #  Build client objects statically ?