From b690e5abbdff891e3ae892b88443160e174fac78 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Tue, 14 Nov 2017 23:41:20 -0600
Subject: [PATCH] Move tool configs into module cfg/CONFIG* files

---
 configure/CONFIG_BASE | 57 +++++++------------------------------------
 modules/ca            |  2 +-
 modules/database      |  2 +-
 modules/libcom        |  2 +-
 4 files changed, 12 insertions(+), 51 deletions(-)

diff --git a/configure/CONFIG_BASE b/configure/CONFIG_BASE
index b2acbc890..6d0416369 100644
--- a/configure/CONFIG_BASE
+++ b/configure/CONFIG_BASE
@@ -4,7 +4,7 @@
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
 # EPICS BASE is distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# in file LICENSE that is included with this distribution.
 #*************************************************************************
 
 #---------------------------------------------------------------
@@ -17,16 +17,6 @@ ifdef T_A
   EPICS_BASE_BIN    = $(EPICS_BASE)/bin/$(T_A)
 endif
 
-#---------------------------------------------------------------
-# EPICS Base Ioc libraries 
-
-EPICS_BASE_IOC_LIBS += dbRecStd dbCore ca Com
-
-#---------------------------------------------------------------
-# EPICS Base Host libraries 
-
-EPICS_BASE_HOST_LIBS += ca Com
-
 #---------------------------------------------------------------
 # Version number for base shared libraries (and win32 products)
 
@@ -35,18 +25,8 @@ ifdef BASE_TOP
   SHRLIB_VERSION = $(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)
   # Windows only allows 2 levels of version numbering
   PROD_VERSION = $(EPICS_VERSION).$(EPICS_REVISION)
-  BASE_CPPFLAGS += -DUSE_TYPED_RSET
 endif # BASE_TOP
 
-#---------------------------------------------------------------
-# Base c preprocessor flags
-
-# osithread default stack
-OSITHREAD_USE_DEFAULT_STACK = NO
-OSITHREAD_DEFAULT_STACK_FLAGS_YES = -DOSITHREAD_USE_DEFAULT_STACK
-
-BASE_CPPFLAGS += $(OSITHREAD_DEFAULT_STACK_FLAGS_$(OSITHREAD_USE_DEFAULT_STACK))
-
 #---------------------------------------------------------------
 # Where to find the installed build tools
 #   Windows does not like commands with relative paths starting ../
@@ -58,17 +38,11 @@ FIND_TOOL = $(firstword $(wildcard $(TOOLS)/$(1) $(TOP)/src/tools/$(1)))
 #---------------------------------------------------------------
 # EPICS Base build tools and tool flags
 
-MAKEBPT                    = $(TOOLS)/makeBpt$(HOSTEXE)
-DBEXPAND                   = $(PERL) $(TOOLS)/dbdExpand.pl
-DBTORECORDTYPEH            = $(PERL) $(TOOLS)/dbdToRecordtypeH.pl
-DBTOMENUH                  = $(PERL) $(TOOLS)/dbdToMenuH.pl
-DBDTOHTML                  = $(PERL) $(TOOLS)/dbdToHtml.pl
-PODTOHTML                  = $(PERL) $(TOOLS)/podToHtml.pl
-REGISTERRECORDDEVICEDRIVER = $(PERL) $(TOOLS)/registerRecordDeviceDriver.pl
-CONVERTRELEASE             = $(PERL) $(call FIND_TOOL,convertRelease.pl)
-FULLPATHNAME               = $(PERL) $(TOOLS)/fullPathName.pl
-TAPTOJUNIT                 = $(PERL) $(TOOLS)/tap-to-junit-xml.pl
-GENVERSIONHEADER           = $(PERL) $(TOOLS)/genVersionHeader.pl $(QUIET_FLAG)
+PODTOHTML        = $(PERL) $(TOOLS)/podToHtml.pl
+CONVERTRELEASE   = $(PERL) $(call FIND_TOOL,convertRelease.pl)
+FULLPATHNAME     = $(PERL) $(TOOLS)/fullPathName.pl
+TAPTOJUNIT       = $(PERL) $(TOOLS)/tap-to-junit-xml.pl
+GENVERSIONHEADER = $(PERL) $(TOOLS)/genVersionHeader.pl $(QUIET_FLAG)
 
 #---------------------------------------------------------------
 # tools for installing libraries and products
@@ -77,19 +51,6 @@ INSTALL_PRODUCT = $(INSTALL)
 INSTALL_LIBRARY = $(INSTALL)
 
 #---------------------------------------------------------------
-# tools for making header dependancies and variable replacement
-MKMF                       = $(PERL) $(TOOLS)/mkmf.pl
-REPLACEVAR                 = $(PERL) $(TOOLS)/replaceVAR.pl
-
-#---------------------------------------------------------------
-# Our versions of lex (flex) and yacc (antelope)
-EYACC = $(TOOLS)/antelope$(HOSTEXE)
-ELEX = $(TOOLS)/e_flex$(HOSTEXE) -S$(EPICS_BASE)/include/flex.skel.static
-
-YACC  = $(EYACC)
-LEX   = $(ELEX)
-
-#---------------------------------------------------------------
-# The 3.15 version of msi supports new options
-
-MSI3_15 = $(EPICS_BASE_HOST_BIN)/msi
+# tools for making header dependencies and variable replacement
+MKMF       = $(PERL) $(TOOLS)/mkmf.pl
+REPLACEVAR = $(PERL) $(TOOLS)/replaceVAR.pl
diff --git a/modules/ca b/modules/ca
index c3a6cfcf0..5dfd1fc0f 160000
--- a/modules/ca
+++ b/modules/ca
@@ -1 +1 @@
-Subproject commit c3a6cfcf0dad4a4eeecf59b474710d06ff3eb68a
+Subproject commit 5dfd1fc0f0cad7dd967d76af0ea58637a8354bad
diff --git a/modules/database b/modules/database
index 2be750a2a..56b6644b8 160000
--- a/modules/database
+++ b/modules/database
@@ -1 +1 @@
-Subproject commit 2be750a2a09e8652d20f629ac7c52de0d6cdadbe
+Subproject commit 56b6644b878cff4b9d7c2218167d94af84e02ec0
diff --git a/modules/libcom b/modules/libcom
index 0a5e6ba69..ea7802a83 160000
--- a/modules/libcom
+++ b/modules/libcom
@@ -1 +1 @@
-Subproject commit 0a5e6ba69acc765098e6b39c1d18d626e197e0b3
+Subproject commit ea7802a8383fa330f2fcc9497bbeca8073325a3e