--- gdb/configure.ac

+++ gdb/configure.ac

@@ -167,7 +167,7 @@ build_tools="build-texinfo build-byacc build-flex build-bison build-m4 build-fix

 # these libraries are used by various programs built for the host environment

 #

-host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr mpc ppl cloog libelf libiconv"

+host_libs="intl mmalloc libiberty opcodes bfd tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr mpc ppl cloog libelf libiconv"

 # these tools are built for the host environment

 # Note, the powerpc-eabi build depends on sim occurring before gdb in order to

--- gdb/configure

+++ gdb/configure

@@ -2894,7 +2894,7 @@ build_tools="build-texinfo build-byacc build-flex build-bison build-m4 build-fix

 # these libraries are used by various programs built for the host environment

 #

-host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr mpc ppl cloog libelf libiconv"

+host_libs="intl mmalloc libiberty opcodes bfd tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr mpc ppl cloog libelf libiconv"

 # these tools are built for the host environment

 # Note, the powerpc-eabi build depends on sim occurring before gdb in order to

--- gdb/gdb/Makefile.in

+++ gdb/gdb/Makefile.in

@@ -141,11 +141,11 @@ LIBDECNUMBER_SRC = $(srcdir)/$(LIBDECNUMBER_DIR)

 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 = @READLINE@

-READLINE_DEPS = @READLINE_DEPS@

-READLINE_CFLAGS = @READLINE_CFLAGS@

+READLINE_DIR = /usr/include/readline

+READLINE_SRC = $(READLINE_DIR)

+READLINE = -lreadline

+READLINE_DEPS =

+READLINE_CFLAGS =

 # Where is expat?  This will be empty if expat was not available.

 LIBEXPAT = @LIBEXPAT@

--- gdb/gdb/doc/Makefile.in

+++ gdb/gdb/doc/Makefile.in

@@ -62,7 +62,7 @@ BUGURL_TEXI = @REPORT_BUGS_TEXI@

 # Where is the source dir for the READLINE library doc?  

 # Traditionally readline is in .. or .

-READLINE_DIR = ${gdbdir}/../readline/doc

+READLINE_DIR = ${gdbdir}/../readline-doc

 # The GDB/MI docs come from a sibling directory ../mi

 GDBMI_DIR = ${gdbdir}/mi