Modified defaults for command-line input support.

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

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

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

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
+

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
+