From 2069889347b05538d6ee3a6825b4a6b5cef700eb Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Mon, 22 Nov 2010 10:40:49 -0600
Subject: [PATCH] docs: Update notes and comments about readline settings.

---
 configure/os/CONFIG_SITE.Common.linux-cris   | 18 ++++++++++++++++--
 configure/os/CONFIG_SITE.Common.linux-x86    | 17 ++++++++++++-----
 configure/os/CONFIG_SITE.Common.linux-x86_64 | 13 ++++++++++---
 documentation/RELEASE_NOTES.html             |  6 +++++-
 4 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/configure/os/CONFIG_SITE.Common.linux-cris b/configure/os/CONFIG_SITE.Common.linux-cris
index 27681a390..c748c1368 100644
--- a/configure/os/CONFIG_SITE.Common.linux-cris
+++ b/configure/os/CONFIG_SITE.Common.linux-cris
@@ -1,5 +1,7 @@
 # CONFIG_SITE.Common.linux-cris
 #
+# $Revision-Id$
+#
 # Site Specific definitions for linux-cris target
 # Only the local epics system manager should modify this file
 
@@ -15,9 +17,21 @@
 # c) Add the runtime path to /etc/ld.so.conf and run ldconfig
 #    to inform the system of the shared library location.
 
-# If readline is not installed comment the following line
-# to omit command-line editing and history support
+# Depending on your version of Linux you may want one of the following
+# lines to enable command-line editing and history in iocsh.  If you're
+# not sure which, start with the top one and work downwards until the
+# build doesn't fail to link the readline library.  If none of them work,
+# comment them all out to build without readline support.
 
+# No other libraries needed (recent Fedora, Ubuntu etc.):
 #COMMANDLINE_LIBRARY = READLINE
+
+# Needs -lncurses (RHEL 5 etc.):
+#COMMANDLINE_LIBRARY = READLINE_NCURSES
+
+# Needs -lcurses (older versions)
+#COMMANDLINE_LIBRARY = READLINE_CURSES
+
+
 OP_SYS_CFLAGS += -g
 
diff --git a/configure/os/CONFIG_SITE.Common.linux-x86 b/configure/os/CONFIG_SITE.Common.linux-x86
index b6ded1a71..19a5794c9 100644
--- a/configure/os/CONFIG_SITE.Common.linux-x86
+++ b/configure/os/CONFIG_SITE.Common.linux-x86
@@ -18,12 +18,19 @@
 #    to inform the system of the shared library location.
 
 # Depending on your version of Linux you'll want one of the following
-# lines to enable command-line editing and history support.  If you're
+# lines to enable command-line editing and history in iocsh.  If you're
 # not sure which, start with the top one and work downwards until the
-# build doesn't fail to link the readline library.  If none of them
-# work, comment them all out.
-#COMMANDLINE_LIBRARY = READLINE
-COMMANDLINE_LIBRARY = READLINE_NCURSES
+# build doesn't fail to link the readline library.  If none of them work,
+# comment them all out to build without readline support.
+
+# No other libraries needed (recent Fedora, Ubuntu etc.):
+COMMANDLINE_LIBRARY = READLINE
+
+# Needs -lncurses (RHEL 5 etc.):
+#COMMANDLINE_LIBRARY = READLINE_NCURSES
+
+# Needs -lcurses (older versions)
 #COMMANDLINE_LIBRARY = READLINE_CURSES
 
+
 OP_SYS_CFLAGS += -g
diff --git a/configure/os/CONFIG_SITE.Common.linux-x86_64 b/configure/os/CONFIG_SITE.Common.linux-x86_64
index 531b0258e..9d3bbd132 100644
--- a/configure/os/CONFIG_SITE.Common.linux-x86_64
+++ b/configure/os/CONFIG_SITE.Common.linux-x86_64
@@ -18,12 +18,19 @@
 #    to inform the system of the shared library location.
 
 # Depending on your version of Linux you'll want one of the following
-# lines to enable command-line editing and history support.  If you're
+# lines to enable command-line editing and history in iocsh.  If you're
 # not sure which, start with the top one and work downwards until the
-# build doesn't fail to link the readline library.  If none of them
-# work, comment them all out.
+# build doesn't fail to link the readline library.  If none of them work,
+# comment them all out to build without readline support.
+
+# No other libraries needed (recent Fedora, Ubuntu etc.):
 COMMANDLINE_LIBRARY = READLINE
+
+# Needs -lncurses (RHEL 5 etc.):
 #COMMANDLINE_LIBRARY = READLINE_NCURSES
+
+# Needs -lcurses (older versions)
 #COMMANDLINE_LIBRARY = READLINE_CURSES
 
+
 OP_SYS_CFLAGS += -g
diff --git a/documentation/RELEASE_NOTES.html b/documentation/RELEASE_NOTES.html
index 9cff87b94..52b7d41e5 100644
--- a/documentation/RELEASE_NOTES.html
+++ b/documentation/RELEASE_NOTES.html
@@ -286,7 +286,11 @@ server.</p>
 readline; some need <tt>-lcurses</tt>, others <tt>-lncurses</tt> and others
 don't require either.  The <tt>configure/os/CONFIG_SITE.Common.linux-*</tt>
 files now make this configuration easy to choose between different settings for
-the <tt>COMMANDLINE_LIBRARY</tt> variable.</p>
+the <tt>COMMANDLINE_LIBRARY</tt> variable.  If your build fails as it's trying
+to create the <tt>antelope</tt> binary in the Base directory
+<tt>src/toolsComm/antelope/O.<i>arch</i></tt> this is almost certainly the
+problem. You will need to do a <tt>make rebuild</tt> from the top of Base after
+fixing the setting of <tt>COMMANDLINE_LIBRARY</tt>.</p>
 
 <h4>CA Command Line Tools Changes</h4>