diff -Naur insight-7.4.50.orig/gdb/configure.ac insight-7.4.50.new/gdb/configure.ac
--- insight-7.4.50.orig/gdb/configure.ac 2012-03-08 20:08:11.000000000 +0100
+++ insight-7.4.50.new/gdb/configure.ac 2012-04-03 14:06:44.114556080 +0200
@@ -600,16 +600,19 @@
if test "$with_system_readline" = yes; then
READLINE=-lreadline
READLINE_DEPS=
+ READLINE_SRC='$(includedir)/readline'
READLINE_CFLAGS=
READLINE_TEXI_INCFLAG=
else
READLINE='$(READLINE_DIR)/libreadline.a'
READLINE_DEPS='$(READLINE)'
+ READLINE_SRC='$(srcdir)/../readline'
READLINE_CFLAGS='-I$(READLINE_SRC)/..'
READLINE_TEXI_INCFLAG='-I $(READLINE_DIR)'
fi
AC_SUBST(READLINE)
AC_SUBST(READLINE_DEPS)
+AC_SUBST(READLINE_SRC)
AC_SUBST(READLINE_CFLAGS)
AC_SUBST(READLINE_TEXI_INCFLAG)
diff -Naur insight-7.4.50.orig/gdb/doc/gdb.texinfo insight-7.4.50.new/gdb/doc/gdb.texinfo
--- insight-7.4.50.orig/gdb/doc/gdb.texinfo 2012-03-28 23:31:46.000000000 +0200
+++ insight-7.4.50.new/gdb/doc/gdb.texinfo 2012-04-03 14:03:55.788977692 +0200
@@ -32920,9 +32920,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
@@ -32954,7 +32951,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.
@@ -32980,7 +32977,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-7.4.50.orig/gdb/doc/Makefile.in insight-7.4.50.new/gdb/doc/Makefile.in
--- insight-7.4.50.orig/gdb/doc/Makefile.in 2012-01-04 09:17:20.000000000 +0100
+++ insight-7.4.50.new/gdb/doc/Makefile.in 2012-04-03 14:16:28.796783806 +0200
@@ -118,9 +118,7 @@
GDB_DOC_SOURCE_INCLUDES = \
$(srcdir)/fdl.texi \
$(srcdir)/gpl.texi \
- $(srcdir)/agentexpr.texi \
- $(READLINE_DIR)/rluser.texi \
- $(READLINE_DIR)/hsuser.texi
+ $(srcdir)/agentexpr.texi
GDB_DOC_BUILD_INCLUDES = \
gdb-cfg.texi \
GDBvn.texi
diff -Naur insight-7.4.50.orig/gdb/Makefile.in insight-7.4.50.new/gdb/Makefile.in
--- insight-7.4.50.orig/gdb/Makefile.in 2012-04-03 14:02:35.701509142 +0200
+++ insight-7.4.50.new/gdb/Makefile.in 2012-04-03 14:03:55.791977556 +0200
@@ -142,8 +142,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@