diff -Naur insight-6.8.orig/gdb/configure.ac insight-6.8.new/gdb/configure.ac --- insight-6.8.orig/gdb/configure.ac 2008-01-13 13:23:05.000000000 +0100 +++ insight-6.8.new/gdb/configure.ac 2008-08-21 12:53:11.000000000 +0200 @@ -441,14 +441,17 @@ if test "$with_system_readline" = yes; then READLINE=-lreadline READLINE_DEPS= + READLINE_SRC='$(includedir)/readline' READLINE_CFLAGS= else READLINE='$(READLINE_DIR)/libreadline.a' READLINE_DEPS='$(READLINE)' + READLINE_SRC='$(srcdir)/../readline' READLINE_CFLAGS='-I$(READLINE_SRC)/..' fi AC_SUBST(READLINE) AC_SUBST(READLINE_DEPS) +AC_SUBST(READLINE_SRC) AC_SUBST(READLINE_CFLAGS) AC_ARG_WITH(expat, diff -Naur insight-6.8.orig/gdb/doc/gdb.texinfo insight-6.8.new/gdb/doc/gdb.texinfo --- insight-6.8.orig/gdb/doc/gdb.texinfo 2008-03-26 19:38:21.000000000 +0100 +++ insight-6.8.new/gdb/doc/gdb.texinfo 2008-08-21 12:35:15.000000000 +0200 @@ -158,8 +158,8 @@ * GDB Bugs:: Reporting bugs in @value{GDBN} -* Command Line Editing:: Command Line Editing -* Using History Interactively:: Using History Interactively +* Command Line Editing: (rluserman). Command Line Editing +* Using History Interactively: (history). Using History Interactively * Formatting Documentation:: How to format and print @value{GDBN} documentation * Installing GDB:: Installing GDB * Maintenance Commands:: Maintenance Commands @@ -15863,7 +15863,7 @@ Show whether command line editing is enabled. @end table -@xref{Command Line Editing}, for more details about the Readline +@xref{Command Line Editing, , , rluserman, GNU Readline Library}, for more details about the Readline interface. Users unfamiliar with @sc{gnu} Emacs or @code{vi} are encouraged to read that chapter. @@ -15878,7 +15878,8 @@ @value{GDBN} uses the @sc{gnu} History library, a part of the Readline package, to provide the history facility. @xref{Using History -Interactively}, for the detailed description of the History library. +Interactively, , , history, GNU History Library}, for the detailed description +of the History library. To issue a command to @value{GDBN} without affecting certain aspects of the state which is seen by users, prefix it with @samp{server } @@ -15930,7 +15931,7 @@ @end table History expansion assigns special meaning to the character @kbd{!}. -@xref{Event Designators}, for more details. +@xref{Event Designators, , , history, GNU History Library}, for more details. @cindex history expansion, turn on/off Since @kbd{!} is also the logical not operator in C, history expansion @@ -17058,7 +17059,8 @@ @cindex TUI key bindings The TUI installs several key bindings in the readline keymaps -(@pxref{Command Line Editing}). The following key bindings +(@pxref{Command Line Editing, , , rluserman, GNU Readline Library}). +The following key bindings are installed for both TUI mode and the @value{GDBN} standard mode. @table @kbd @@ -22457,15 +22459,6 @@ things without first using the debugger to find the facts. @end itemize -@c The readline documentation is distributed with the readline code -@c and consists of the two following files: -@c rluser.texinfo -@c inc-hist.texinfo -@c Use -I with makeinfo to point to the appropriate directory, -@c environment var TEXINPUTS with TeX. -@include rluser.texi -@include inc-hist.texinfo - @node Formatting Documentation @appendix Formatting Documentation @@ -22645,9 +22638,6 @@ @item gdb-@value{GDBVN}/opcodes source for the library of opcode tables and disassemblers -@item gdb-@value{GDBVN}/readline -source for the @sc{gnu} command-line interface - @item gdb-@value{GDBVN}/glob source for the @sc{gnu} filename pattern-matching subroutine @@ -22679,7 +22669,7 @@ correct value by examining your system.) Running @samp{configure @var{host}} and then running @code{make} builds the -@file{bfd}, @file{readline}, @file{mmalloc}, and @file{libiberty} +@file{bfd}, @file{mmalloc}, and @file{libiberty} libraries, then @code{gdb} itself. The configured source files, and the binaries, are left in the corresponding source directories. @@ -22705,7 +22695,7 @@ that subdirectory. That is usually not what you want. In particular, if you run the first @file{configure} from the @file{gdb} subdirectory of the @file{gdb-@var{version-number}} directory, you will omit the -configuration of @file{bfd}, @file{readline}, and other sibling +configuration of @file{bfd}, and other sibling directories of the @file{gdb} subdirectory. This leads to build errors about missing include files such as @file{bfd/bfd.h}. diff -Naur insight-6.8.orig/gdb/doc/Makefile.in insight-6.8.new/gdb/doc/Makefile.in --- insight-6.8.orig/gdb/doc/Makefile.in 2008-01-01 23:53:14.000000000 +0100 +++ insight-6.8.new/gdb/doc/Makefile.in 2008-08-21 12:35:14.000000000 +0200 @@ -109,9 +109,7 @@ GDB_DOC_SOURCE_INCLUDES = \ $(srcdir)/fdl.texi \ $(srcdir)/gpl.texi \ - $(srcdir)/agentexpr.texi \ - $(READLINE_DIR)/rluser.texi \ - $(READLINE_DIR)/inc-hist.texinfo + $(srcdir)/agentexpr.texi GDB_DOC_BUILD_INCLUDES = \ gdb-cfg.texi \ GDBvn.texi diff -Naur insight-6.8.orig/gdb/Makefile.in insight-6.8.new/gdb/Makefile.in --- insight-6.8.orig/gdb/Makefile.in 2008-08-21 12:33:36.000000000 +0200 +++ insight-6.8.new/gdb/Makefile.in 2008-08-21 12:54:15.000000000 +0200 @@ -132,8 +132,7 @@ LIBDECNUMBER_CFLAGS = -I$(LIBDECNUMBER_DIR) -I$(LIBDECNUMBER_SRC) # Where is the READLINE library? Typically in ../readline. -READLINE_DIR = ../readline -READLINE_SRC = $(srcdir)/$(READLINE_DIR) +READLINE_SRC = @READLINE_SRC@ READLINE = @READLINE@ READLINE_DEPS = @READLINE_DEPS@ READLINE_CFLAGS = @READLINE_CFLAGS@