adcore.patch

diff --git a/ADApp/commonDriverMakefile b/ADApp/commonDriverMakefile
index 7217ad42..b5aa4ef5 100644
--- a/ADApp/commonDriverMakefile
+++ b/ADApp/commonDriverMakefile
@@ -1,7 +1,25 @@
 # This file contains the commands to build driver applications using the common set of plugins
 # The variable DBD_NAME should be defined to specify the name of the application DBD file.
-# For backwards compatibilty if DBD_NAME is not specified then PROD_NAME must be specified, 
+# For backwards compatibilty if DBD_NAME is not specified then PROD_NAME must be specified,
 # and DBD_NAME will set to this.
+WITH_BOOST     = NO
+BOOST_EXTERNAL = NO
+WITH_HDF5 =  YES
+HDF5_EXTERNAL =  NO
+XML2_EXTERNAL =  NO
+WITH_NETCDF = YES
+NETCDF_EXTERNAL = NO
+WITH_NEXUS =  YES
+NEXUS_EXTERNAL =  NO
+WITH_TIFF =  YES
+TIFF_EXTERNAL =  NO
+WITH_JPEG =  YES
+JPEG_EXTERNAL =  NO
+WITH_SZIP =  YES
+SZIP_EXTERNAL =  NO
+WITH_ZLIB =  YES
+ZLIB_EXTERNAL =  NO
+HOST_OPT=NO
 
 ifndef DBD_NAME
   DBD_NAME = $(PROD_NAME)
@@ -199,7 +217,7 @@ PROD_LIBS          += asyn
 
 ifeq ($(EPICS_LIBCOM_ONLY),YES)
   PROD_LIBS        += Com
-else 
+else
   # Optional modules
   ifdef ALIVE
     $(DBD_NAME)_DBD += aliveSupport.dbd
diff --git a/ADApp/commonLibraryMakefile b/ADApp/commonLibraryMakefile
index b83944a7..2cc3adfc 100644
--- a/ADApp/commonLibraryMakefile
+++ b/ADApp/commonLibraryMakefile
@@ -1,4 +1,22 @@
 # This file contains the commands to build driver and plugin libraries
+WITH_BOOST     = NO
+BOOST_EXTERNAL = NO
+WITH_HDF5 =  YES
+HDF5_EXTERNAL =  NO
+XML2_EXTERNAL =  NO
+WITH_NETCDF = YES
+NETCDF_EXTERNAL = NO
+WITH_NEXUS =  YES
+NEXUS_EXTERNAL =  NO
+WITH_TIFF =  YES
+TIFF_EXTERNAL =  NO
+WITH_JPEG =  YES
+JPEG_EXTERNAL =  NO
+WITH_SZIP =  YES
+SZIP_EXTERNAL =  NO
+WITH_ZLIB =  YES
+ZLIB_EXTERNAL =  NO
+HOST_OPT=NO
 
 LIB_LIBS += ADBase
 LIB_LIBS += asyn
@@ -156,6 +174,6 @@ else
   LIB_LIBS += $(EPICS_BASE_IOC_LIBS)
 endif
 
-LIB_SYS_LIBS_WIN32      += gdi32 oleaut32 
+LIB_SYS_LIBS_WIN32      += gdi32 oleaut32
 
 USR_LDFLAGS_Darwin      += -framework CoreFoundation
diff --git a/ADApp/pluginSrc/Makefile b/ADApp/pluginSrc/Makefile
index d2f19888..b190091a 100644
--- a/ADApp/pluginSrc/Makefile
+++ b/ADApp/pluginSrc/Makefile
@@ -3,6 +3,24 @@ include $(TOP)/configure/CONFIG
 #----------------------------------------
 #  ADD MACRO DEFINITIONS AFTER THIS LINE
 #=============================
+WITH_BOOST     = NO
+BOOST_EXTERNAL = NO
+WITH_HDF5 =  YES
+HDF5_EXTERNAL =  NO
+XML2_EXTERNAL =  NO
+WITH_NETCDF = YES
+NETCDF_EXTERNAL = NO
+WITH_NEXUS =  YES
+NEXUS_EXTERNAL =  NO
+WITH_TIFF =  YES
+TIFF_EXTERNAL =  NO
+WITH_JPEG =  YES
+JPEG_EXTERNAL =  NO
+WITH_SZIP =  YES
+SZIP_EXTERNAL =  NO
+WITH_ZLIB =  YES
+ZLIB_EXTERNAL =  NO
+HOST_OPT=NO
 
 LIBRARY_IOC += NDPlugin
 DBD         += NDPluginSupport.dbd
@@ -81,7 +99,7 @@ LIB_SRCS += NDPluginAttrPlot.cpp
 DBD      += NDPosPlugin.dbd
 INC      += NDPosPlugin.h
 INC      += NDPosPluginFileReader.h
-LIB_SRCS += NDPosPlugin.cpp 
+LIB_SRCS += NDPosPlugin.cpp
 LIB_SRCS += NDPosPluginFileReader.cpp
 
 INC      += NDPluginFile.h
@@ -111,11 +129,11 @@ ifeq ($(WITH_HDF5),YES)
   INC      += NDFileHDF5Layout.h
   INC      += NDFileHDF5LayoutXML.h
   INC      += NDFileHDF5VersionCheck.h
-  LIB_SRCS += NDFileHDF5.cpp 
-  LIB_SRCS += NDFileHDF5Dataset.cpp 
-  LIB_SRCS += NDFileHDF5AttributeDataset.cpp 
-  LIB_SRCS += NDFileHDF5LayoutXML.cpp 
-  LIB_SRCS += NDFileHDF5Layout.cpp 
+  LIB_SRCS += NDFileHDF5.cpp
+  LIB_SRCS += NDFileHDF5Dataset.cpp
+  LIB_SRCS += NDFileHDF5AttributeDataset.cpp
+  LIB_SRCS += NDFileHDF5LayoutXML.cpp
+  LIB_SRCS += NDFileHDF5Layout.cpp
   ifdef HDF5_INCLUDE
     USR_INCLUDES += $(addprefix -I, $(HDF5_INCLUDE))
   endif
@@ -127,7 +145,7 @@ endif
 ifeq ($(WITH_JPEG),YES)
   DBD      += NDFileJPEG.dbd
   INC      += NDFileJPEG.h
-  LIB_SRCS += NDFileJPEG.cpp 
+  LIB_SRCS += NDFileJPEG.cpp
   ifdef JPEG_INCLUDE
     USR_INCLUDES += $(addprefix -I, $(JPEG_INCLUDE))
   endif
@@ -145,7 +163,7 @@ endif
 ifeq ($(WITH_NEXUS),YES)
   DBD      += NDFileNexus.dbd
   INC      += NDFileNexus.h
-  LIB_SRCS += NDFileNexus.cpp 
+  LIB_SRCS += NDFileNexus.cpp
   ifdef NEXUS_INCLUDE
     USR_INCLUDES += $(addprefix -I, $(NEXUS_INCLUDE))
   endif
@@ -154,7 +172,7 @@ endif
 ifeq ($(WITH_TIFF),YES)
   DBD      += NDFileTIFF.dbd
   INC      += NDFileTIFF.h
-  LIB_SRCS += NDFileTIFF.cpp 
+  LIB_SRCS += NDFileTIFF.cpp
   ifeq ($(SHARED_LIBRARIES),NO)
     # This flag is used to indicate that the TIFF library was built statically
     USR_CXXFLAGS_WIN32 += -DLIBTIFF_STATIC
@@ -182,7 +200,7 @@ NDPlugin_SYS_LIBS_WIN32 += user32
 #LIB_SRCS += test_forward_reference.cpp
 
 
-# The following gets rid of the -fno-implicit-templates flag on vxWorks, 
+# The following gets rid of the -fno-implicit-templates flag on vxWorks,
 # so we get automatic template instantiation.
 # This is what we want for the source files that define template functions.
 ifeq (vxWorks,$(findstring vxWorks, $(T_A)))
@@ -194,4 +212,3 @@ include $(TOP)/ADApp/commonLibraryMakefile
 include $(TOP)/configure/RULES
 #----------------------------------------
 #  ADD RULES AFTER THIS LINE
-
diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE
index 4df968fb..2f774af2 100644
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -40,3 +40,21 @@ ifdef T_A
   -include $(AREA_DETECTOR)/configure/CONFIG_SITE.Common.$(T_A)
   -include $(AREA_DETECTOR)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
 endif
+WITH_BOOST     = NO
+BOOST_EXTERNAL = NO
+WITH_HDF5 =  YES
+HDF5_EXTERNAL =  YES
+XML2_EXTERNAL =  NO
+WITH_NETCDF = YES
+NETCDF_EXTERNAL = NO
+WITH_NEXUS =  YES
+NEXUS_EXTERNAL =  NO
+WITH_TIFF =  YES
+TIFF_EXTERNAL =  NO
+WITH_JPEG =  YES
+JPEG_EXTERNAL =  NO
+WITH_SZIP =  YES
+SZIP_EXTERNAL =  NO
+WITH_ZLIB =  YES
+ZLIB_EXTERNAL =  NO
+HOST_OPT=NO

adsim.patch

diff --git a/Makefile b/Makefile
index 139f2f8..a8f13a6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,8 @@
 #Makefile at top of application tree
 TOP = .
 include $(TOP)/configure/CONFIG
+BUILD_IOCS=YES
+
 DIRS := $(DIRS) $(filter-out $(DIRS), configure)
 DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *App))
 DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *app))
@@ -19,4 +21,3 @@ realuninstall: realuninstall_iocs
 realuninstall_iocs:
 	$(MAKE) -C iocs realuninstall
 .PHONY: realuninstall realuninstall_iocs
-
diff --git a/iocs/Makefile b/iocs/Makefile
index 8db1c93..cfe27eb 100644
--- a/iocs/Makefile
+++ b/iocs/Makefile
@@ -1,6 +1,25 @@
 TOP = ..
 include $(TOP)/configure/CONFIG
 
+WITH_BOOST     = NO
+BOOST_EXTERNAL = NO
+WITH_HDF5 =  YES
+HDF5_EXTERNAL =  NO
+XML2_EXTERNAL =  NO
+WITH_NETCDF = YES
+NETCDF_EXTERNAL = NO
+WITH_NEXUS =  YES
+NEXUS_EXTERNAL =  NO
+WITH_TIFF =  YES
+TIFF_EXTERNAL =  NO
+WITH_JPEG =  YES
+JPEG_EXTERNAL =  NO
+WITH_SZIP =  YES
+SZIP_EXTERNAL =  NO
+WITH_ZLIB =  YES
+ZLIB_EXTERNAL =  NO
+HOST_OPT=NO
+
 ifeq ($(WITH_HDF5),YES)
   DIRS += simDetectorNoIOC
 endif
@@ -28,4 +47,3 @@ $(1)$(DIVIDER)realuninstall:
 endef
 $(foreach dir, $(DIRS), $(eval $(call REALUNINSTALL_template,$(dir))))
 .PHONY: realuninstall $(realuninstallTargets)
-

core.config_site.arch.Common

WITH_BOOST     = NO
BOOST_EXTERNAL = NO
WITH_HDF5 =  YES
HDF5_EXTERNAL =  NO
XML2_EXTERNAL =  NO
WITH_NETCDF = YES
NETCDF_EXTERNAL = NO
WITH_NEXUS =  YES
NEXUS_EXTERNAL =  NO
WITH_TIFF =  YES
TIFF_EXTERNAL =  NO
WITH_JPEG =  YES
JPEG_EXTERNAL =  NO
WITH_SZIP =  YES
SZIP_EXTERNAL =  NO
WITH_ZLIB =  YES
ZLIB_EXTERNAL =  NO
HOST_OPT=NO

support.CONFIG_SITE.arch.Common

WITH_BOOST=NO
BOOST_EXTERNAL=NO
WITH_HDF5=YES
HDF5_EXTERNAL=NO
XML2_EXTERNAL=NO
WITH_NETCDF=YES
NETCDF_EXTERNAL=NO
WITH_NEXUS=YES
NEXUS_EXTERNAL=NO
WITH_TIFF=YES
TIFF_EXTERNAL=NO
WITH_JPEG=YES
JPEG_EXTERNAL=NO
WITH_SZIP=YES
SZIP_EXTERNAL=NO
WITH_ZLIB=YES
ZLIB_EXTERNAL=NO
HOST_OPT=NO
WITH_PVA=NO