From 22e557ffad2ea27eb4f70528ef11c579402dc29d Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Mon, 25 Nov 2002 22:25:44 +0000
Subject: [PATCH] Modified  defaults for command-line input support.

---
 configure/CONFIG_COMMON               | 10 +++++-----
 configure/CONFIG_SITE                 |  9 ---------
 configure/os/CONFIG.Common.RTEMS      |  5 +++++
 configure/os/CONFIG.Common.darwin-ppc |  5 +++++
 configure/os/CONFIG.Common.linux-x86  |  6 ++++++
 5 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON
index 3ebe65d77..d9a22dbc4 100644
--- a/configure/CONFIG_COMMON
+++ b/configure/CONFIG_COMMON
@@ -164,6 +164,11 @@ LIBRARY_LD_RESS = $(TARGET_RESS) $(LIBRARY_RESS)
 PROD_BAF = $(addsuffix $(BAF), $(basename $(PROD)))
 LIB_BAF=$(addsuffix $(BAF),$(basename $(LIBRARY)))
 
+#--------------------------------------------------
+#  Command-line input support default
+COMMANDLINE_LIBRARY = EPICS
+OP_SYS_LDLIBS += $(LDLIBS_$(COMMANDLINE_LIBRARY))
+
 #--------------------------------------------------
 # C preprocessor, compiler, and linker flag defaults
 
@@ -371,9 +376,4 @@ SOURCE_INC = $(wildcard $(file) $(SOURCE_INC_bbb) )
 SOURCE_INC_bbb = $(foreach dir, $(ALL_SRC_DIRS), $(SOURCE_INC_aaa)  )
 SOURCE_INC_aaa = $(addsuffix /$(file), $(dir) )
  
-# Command-line input support
-OP_SYS_CFLAGS += -DEPICS_COMMANDLINE_LIBRARY=EPICS_COMMANDLINE_LIBRARY_$(COMMANDLINE_LIBRARY)
-
-OP_SYS_LDLIBS += $(LDLIBS_$(COMMANDLINE_LIBRARY))
-
 endif
diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE
index 2662ec49b..e98905431 100644
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -125,12 +125,3 @@ CROSS_WARN=YES
 #  Installation directory
 INSTALL_LOCATION=$(TOP)
 
-#  Command-line input support
-#
-#  Currently Supporting:
-#   EPICS    - Built-in EPICS routines (no command-line editing/history)
-#   READLINE - GNU readline library
-#   LIBTECLA - LIBTECLA library
-#
-#COMMANDLINE_LIBRARY=
-COMMANDLINE_LIBRARY=READLINE
diff --git a/configure/os/CONFIG.Common.RTEMS b/configure/os/CONFIG.Common.RTEMS
index bdb118b1f..ab1f4cfba 100644
--- a/configure/os/CONFIG.Common.RTEMS
+++ b/configure/os/CONFIG.Common.RTEMS
@@ -96,6 +96,11 @@ CODE_CXXFLAGS =
 CONFORM_CFLAGS_STRICT = -ansi
 CONFORM_CXXFLAGS_STRICT = -ansi
 
+#--------------------------------------------------
+# Command-line input support
+COMMANDLINE_LIBRARY = READLINE
+LDLIBS_READLINE = -lreadline -lncurses
+
 #--------------------------------------------------
 # Allow site overrides
 -include $(CONFIG)/os/CONFIG_SITE.Common.RTEMS
diff --git a/configure/os/CONFIG.Common.darwin-ppc b/configure/os/CONFIG.Common.darwin-ppc
index bad2f70af..ccfb33e09 100644
--- a/configure/os/CONFIG.Common.darwin-ppc
+++ b/configure/os/CONFIG.Common.darwin-ppc
@@ -40,3 +40,8 @@ SHRLIB_LDFLAGS = -dynamiclib -flat_namespace -undefined suppress \
        -current_version $(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)
 SHRLIB_SUFFIX = $(addprefix .,$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)).dylib
 SHRLIB_VERSION = $(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)
+
+#  Command-line input support
+COMMANDLINE_LIBRARY=LIBTECLA
+LDLIBS_LIBTECLA = -ltecla_r -lncurses
+
diff --git a/configure/os/CONFIG.Common.linux-x86 b/configure/os/CONFIG.Common.linux-x86
index 693760af2..2f951b06c 100644
--- a/configure/os/CONFIG.Common.linux-x86
+++ b/configure/os/CONFIG.Common.linux-x86
@@ -37,3 +37,9 @@ endif
 
 #Allow R3.13 built extensions to load R3.14 shared libs
 SYS_SHRLIB_LIBS += pthread rt
+
+
+# Command-line input support
+COMMANDLINE_LIBRARY = READLINE
+LDLIBS_READLINE = -lreadline -lncurses
+