From 877242d0380a80d82ba7eb87223bb0d2339e90b3 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Fri, 10 Dec 2010 15:15:37 -0600
Subject: [PATCH] configure: Deleted CONFIG_COMPAT (3.13 compatibility)

---
 configure/CONFIG           | 31 ++-----------------------------
 configure/os/CONFIG_COMPAT | 26 --------------------------
 2 files changed, 2 insertions(+), 55 deletions(-)
 delete mode 100644 configure/os/CONFIG_COMPAT

diff --git a/configure/CONFIG b/configure/CONFIG
index 1b3664bfd..305c6e3de 100644
--- a/configure/CONFIG
+++ b/configure/CONFIG
@@ -1,18 +1,13 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
+# EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 #
 #  $Revision-Id$
-#
-#  The developer may edit this file.
-# assume T_A is the host arch if not specified
-
 #
 #  Common build definitions
 #
@@ -32,8 +27,6 @@ EPICS_HOST_ARCH := $(shell $(CONFIG)/../startup/EpicsHostArch.pl)
 endif
 #
 
--include $(CONFIG)/os/CONFIG_COMPAT
-
 -include $(CONFIG)/RELEASE
 -include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH)
 -include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH).Common
@@ -118,23 +111,3 @@ ifdef T_A
 -include $(HOME)/configure/CONFIG_USER.Common.$(T_A)
 -include $(HOME)/configure/CONFIG_USER.$(EPICS_HOST_ARCH).$(T_A)
 endif
-
-#  All options
-#   may be overridden here.
-#
-# EXAMPLES
-# --------
-#  Build client objects statically ?  must be either YES or NO
-#STATIC_BUILD=NO
-#  Host build optimization,   must be either YES or NO
-#HOST_OPT=YES
-#  Cross build optimization,  must be either YES or NO
-#CROSS_OPT=YES
-#  Generate Verbose Compiler Warnings for host build,  must be either YES or NO
-#HOST_WARN=YES
-#  Generate Verbose Compiler Warnings for cross compile builds,  must be either YES or NO
-#CROSS_WARN=YES
-#etc.
-
-#CROSS_COMPILER_TARGET_ARCHS=vxWorks-68040
-
diff --git a/configure/os/CONFIG_COMPAT b/configure/os/CONFIG_COMPAT
deleted file mode 100644
index 525be75d4..000000000
--- a/configure/os/CONFIG_COMPAT
+++ /dev/null
@@ -1,26 +0,0 @@
-# CONFIG_COMPAT
-#
-# $Revision-Id$
-#
-# Convert old HOST_ARCH environment variable to
-# new EPICS_HOST_ARCH environment variable 
-#-------------------------------------------------------
-
-#Syntax:
-# ARCH_<host_arch> = <epics_host_arch>
-ARCH_solaris = solaris-sparc
-ARCH_solarisGnu = solaris-sparc-gnu
-ARCH_Linux = linux-x86
-ARCH_Darwin = darwin-ppc
-ARCH_WIN32 = win32-x86
-ARCH_cygwin32 = cygwin-x86
-ARCH_Borland = win32-x86-borland
-ARCH_freebsd = freebsd-x86
-
-ifndef EPICS_HOST_ARCH
-ifdef HOST_ARCH
-EPICS_HOST_ARCH = $(firstword $(ARCH_$(HOST_ARCH)) $(HOST_ARCH))
-else 
-EPICS_HOST_ARCH = unsupported
-endif
-endif