-diff -urN gdb-5.0.org/Makefile.in gdb-5.0/Makefile.in
---- gdb-5.0.org/Makefile.in Thu May 18 07:00:23 2000
-+++ gdb-5.0/Makefile.in Tue Sep 5 18:32:37 2000
-@@ -558,7 +558,6 @@
- all-perl \
- all-prms \
- all-rcs \
-- all-readline \
- all-release \
- all-recode \
- all-sed \
-@@ -631,7 +630,6 @@
- check-perl \
- check-prms \
- check-rcs \
-- check-readline \
- check-recode \
- check-sed \
- check-send-pr \
-@@ -705,7 +703,6 @@
- install-perl \
- install-prms \
- install-rcs \
-- install-readline \
- install-recode \
- install-sed \
- install-send-pr \
-@@ -869,7 +866,6 @@
- clean-perl \
- clean-prms \
- clean-rcs \
-- clean-readline \
- clean-release \
- clean-recode \
- clean-sed \
-@@ -1561,7 +1557,7 @@
- all-gcc: all-bison all-byacc all-binutils all-gas all-ld
- all-bootstrap: all-libiberty all-bison all-byacc all-binutils all-gas all-ld
- GDB_TK = all-tk all-tcl all-itcl all-tix all-libgui
--all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
-+all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
- all-gettext:
- all-gnuserv:
- configure-target-gperf: $(ALL_GCC)
-@@ -1606,12 +1602,11 @@
- all-perl:
- all-prms: all-libiberty
- all-rcs:
--all-readline:
- all-recode: all-libiberty
- all-sed: all-libiberty
- all-send-pr: all-prms
- all-shellutils:
--all-sim: all-libiberty all-bfd all-opcodes all-readline
-+all-sim: all-libiberty all-bfd all-opcodes
- all-tar: all-libiberty
- all-tcl:
- all-tcl8.1:
-@@ -1853,7 +1848,7 @@
- SUPPORT_FILES="$(GNATS_SUPPORT_DIRS)"
-
- .PHONY: gdb.tar.bz2
--GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes readline sim utils intl
-+GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes sim utils intl
- gdb.tar.bz2: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
- $(MAKE) -f Makefile.in gdb-taz TOOL=gdb \
- MD5PROG="$(MD5PROG)" \
-diff -urN gdb-5.0.org/gdb/Makefile.in gdb-5.0/gdb/Makefile.in
---- gdb-5.0.org/gdb/Makefile.in Tue Sep 5 18:30:00 2000
-+++ gdb-5.0/gdb/Makefile.in Tue Sep 5 19:15:00 2000
-@@ -126,10 +126,10 @@
- BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC)
-
- # Where is the READLINE library? Typically in ../readline.
--READLINE_DIR = ../readline
--READLINE = $(READLINE_DIR)/libreadline.a
--READLINE_SRC = $(srcdir)/$(READLINE_DIR)
--READLINE_CFLAGS = -I$(READLINE_SRC)/..
-+READLINE_DIR = /usr/include/readline
-+READLINE = -lreadline
-+READLINE_SRC = /usr/include/readline
-+READLINE_CFLAGS = -I/usr/include/readline
-
- WARN_CFLAGS = @WARN_CFLAGS@
- WERROR_CFLAGS = @WERROR_CFLAGS@
-diff -urN gdb-5.0.org/gdb/event-top.c gdb-5.0/gdb/event-top.c
---- gdb-5.0.org/gdb/event-top.c Tue Sep 5 19:34:20 2000
-+++ gdb-5.0/gdb/event-top.c Tue Sep 5 19:34:42 2000
-@@ -32,6 +32,7 @@
- #include "gdbcmd.h"
-
- /* readline include files */
-+#define savestring
- #include <readline/readline.h>
- #include <readline/history.h>
-
-diff -urN gdb-5.0.org/gdb/gdbserver/Makefile.in gdb-5.0/gdb/gdbserver/Makefile.in
---- gdb-5.0.org/gdb/gdbserver/Makefile.in Tue Sep 5 18:30:00 2000
-+++ gdb-5.0/gdb/gdbserver/Makefile.in Tue Sep 5 18:30:35 2000
-@@ -87,7 +87,7 @@
+diff -ur gdb-6.7.org/gdb/gdbserver/Makefile.in gdb-6.7/gdb/gdbserver/Makefile.in
+--- gdb-6.7.org/gdb/gdbserver/Makefile.in 2007-06-13 20:50:38.000000000 +0200
++++ gdb-6.7/gdb/gdbserver/Makefile.in 2007-10-10 21:10:05.379655356 +0200
+@@ -78,7 +78,7 @@
# Where is the source dir for the READLINE library? Traditionally in .. or .
# (For the binary library built from it, we use ${READLINE_DIR}${subdir}.)
READLINE_DEP = $$(READLINE_DIR)
# All the includes used for CFLAGS and for lint.
-diff -urN gdb-5.0.org/gdb/top.c gdb-5.0/gdb/top.c
---- gdb-5.0.org/gdb/top.c Wed Apr 12 18:46:03 2000
-+++ gdb-5.0/gdb/top.c Tue Sep 5 19:45:56 2000
-@@ -36,6 +36,7 @@
- #include "version.h"
-
- /* readline include files */
-+#define savestring
- #include <readline/readline.h>
- #include <readline/history.h>
-
-diff -urN gdb-5.0.org/gdb/tracepoint.c gdb-5.0/gdb/tracepoint.c
---- gdb-5.0.org/gdb/tracepoint.c Tue Dec 14 02:05:38 1999
-+++ gdb-5.0/gdb/tracepoint.c Tue Sep 5 19:38:26 2000
-@@ -36,6 +36,7 @@
- #include "ax-gdb.h"
-
- /* readline include files */
-+#define savestring
- #include <readline/readline.h>
- #include <readline/history.h>
-
-diff -urN gdb-5.0.org/gdb/tui/Makefile.in gdb-5.0/gdb/tui/Makefile.in
---- gdb-5.0.org/gdb/tui/Makefile.in Tue Sep 5 18:30:00 2000
-+++ gdb-5.0/gdb/tui/Makefile.in Tue Sep 5 18:28:16 2000
-@@ -49,9 +49,9 @@
+diff -ur gdb-6.7.org/gdb/Makefile.in gdb-6.7/gdb/Makefile.in
+--- gdb-6.7.org/gdb/Makefile.in 2007-09-05 02:14:02.000000000 +0200
++++ gdb-6.7/gdb/Makefile.in 2007-10-10 21:11:18.119976680 +0200
+@@ -126,11 +126,11 @@
BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC)
# Where is the READLINE library? Typically in ../readline.
--READLINE_DIR = ../../readline
+-READLINE_DIR = ../readline
-READLINE_SRC = $(srcdir)/$(READLINE_DIR)
--READLINE_CFLAGS = -I$(READLINE_SRC)
-+READLINE_DIR = /usr/lib
-+READLINE_SRC = /usr/lib
+-READLINE = @READLINE@
+-READLINE_DEPS = @READLINE_DEPS@
+-READLINE_CFLAGS = @READLINE_CFLAGS@
++READLINE_DIR = /usr/include/readline
++READLINE = -lreadline
++READLINE_SRC = /usr/include/readline
++READLINE_DEPS =
+READLINE_CFLAGS = -I/usr/include/readline
- # Where is the INTL library? Typically in ../intl.
- INTL_DIR = ../../intl
-diff -urN gdb-5.0.org/gdb/utils.c gdb-5.0/gdb/utils.c
---- gdb-5.0.org/gdb/utils.c Tue Sep 5 18:54:25 2000
-+++ gdb-5.0/gdb/utils.c Tue Sep 5 19:49:03 2000
-@@ -50,6 +50,7 @@
- #include "language.h"
- #include "annotate.h"
-
-+#define savestring
- #include <readline/readline.h>
-
- #undef XMALLOC
---- gdb-5.0/gdb/defs.h.wiget Fri Apr 13 14:59:59 2001
-+++ gdb-5.0/gdb/defs.h Fri Apr 13 15:00:09 2001
-@@ -603,7 +603,7 @@
-
- /* From readline (but not in any readline .h files). */
-
--extern char *tilde_expand (char *);
-+extern char *tilde_expand (const char *);
-
- /* Control types for commands */
-
+ # Where is expat? This will be empty if expat was not available.
+ LIBEXPAT = @LIBEXPAT@
+@@ -388,7 +388,7 @@
+ $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) @LIBS@ \
+ $(LIBICONV) $(LIBEXPAT) \
+ $(LIBIBERTY) $(WIN32LIBS)
+-CDEPS = $(XM_CDEPS) $(TM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) \
++CDEPS = $(XM_CDEPS) $(TM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) \
+ $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS)
+
+ ADD_FILES = $(XM_ADD_FILES) $(TM_ADD_FILES) $(NAT_ADD_FILES)
+diff -ur gdb-6.7.org/Makefile.in gdb-6.7/Makefile.in
+--- gdb-6.7.org/Makefile.in 2007-10-10 19:09:32.000000000 +0200
++++ gdb-6.7/Makefile.in 2007-10-10 21:10:23.310556251 +0200
+@@ -664,7 +664,6 @@
+ maybe-configure-perl \
+ maybe-configure-prms \
+ maybe-configure-rcs \
+- maybe-configure-readline \
+ maybe-configure-release \
+ maybe-configure-recode \
+ maybe-configure-sed \
+@@ -812,7 +811,6 @@
+ all-host: maybe-all-perl
+ all-host: maybe-all-prms
+ all-host: maybe-all-rcs
+-all-host: maybe-all-readline
+ all-host: maybe-all-release
+ all-host: maybe-all-recode
+ all-host: maybe-all-sed
+@@ -927,7 +925,6 @@
+ info-host: maybe-info-perl
+ info-host: maybe-info-prms
+ info-host: maybe-info-rcs
+-info-host: maybe-info-readline
+ info-host: maybe-info-release
+ info-host: maybe-info-recode
+ info-host: maybe-info-sed
+@@ -1033,7 +1030,6 @@
+ dvi-host: maybe-dvi-perl
+ dvi-host: maybe-dvi-prms
+ dvi-host: maybe-dvi-rcs
+-dvi-host: maybe-dvi-readline
+ dvi-host: maybe-dvi-release
+ dvi-host: maybe-dvi-recode
+ dvi-host: maybe-dvi-sed
+@@ -1245,7 +1241,6 @@
+ html-host: maybe-html-perl
+ html-host: maybe-html-prms
+ html-host: maybe-html-rcs
+-html-host: maybe-html-readline
+ html-host: maybe-html-release
+ html-host: maybe-html-recode
+ html-host: maybe-html-sed
+@@ -1351,7 +1346,6 @@
+ TAGS-host: maybe-TAGS-perl
+ TAGS-host: maybe-TAGS-prms
+ TAGS-host: maybe-TAGS-rcs
+-TAGS-host: maybe-TAGS-readline
+ TAGS-host: maybe-TAGS-release
+ TAGS-host: maybe-TAGS-recode
+ TAGS-host: maybe-TAGS-sed
+@@ -1457,7 +1451,6 @@
+ install-info-host: maybe-install-info-perl
+ install-info-host: maybe-install-info-prms
+ install-info-host: maybe-install-info-rcs
+-install-info-host: maybe-install-info-readline
+ install-info-host: maybe-install-info-release
+ install-info-host: maybe-install-info-recode
+ install-info-host: maybe-install-info-sed
+@@ -1669,7 +1662,6 @@
+ install-html-host: maybe-install-html-perl
+ install-html-host: maybe-install-html-prms
+ install-html-host: maybe-install-html-rcs
+-install-html-host: maybe-install-html-readline
+ install-html-host: maybe-install-html-release
+ install-html-host: maybe-install-html-recode
+ install-html-host: maybe-install-html-sed
+@@ -1775,7 +1767,6 @@
+ installcheck-host: maybe-installcheck-perl
+ installcheck-host: maybe-installcheck-prms
+ installcheck-host: maybe-installcheck-rcs
+-installcheck-host: maybe-installcheck-readline
+ installcheck-host: maybe-installcheck-release
+ installcheck-host: maybe-installcheck-recode
+ installcheck-host: maybe-installcheck-sed
+@@ -1881,7 +1872,6 @@
+ mostlyclean-host: maybe-mostlyclean-perl
+ mostlyclean-host: maybe-mostlyclean-prms
+ mostlyclean-host: maybe-mostlyclean-rcs
+-mostlyclean-host: maybe-mostlyclean-readline
+ mostlyclean-host: maybe-mostlyclean-release
+ mostlyclean-host: maybe-mostlyclean-recode
+ mostlyclean-host: maybe-mostlyclean-sed
+@@ -1987,7 +1977,6 @@
+ clean-host: maybe-clean-perl
+ clean-host: maybe-clean-prms
+ clean-host: maybe-clean-rcs
+-clean-host: maybe-clean-readline
+ clean-host: maybe-clean-release
+ clean-host: maybe-clean-recode
+ clean-host: maybe-clean-sed
+@@ -2093,7 +2082,6 @@
+ distclean-host: maybe-distclean-perl
+ distclean-host: maybe-distclean-prms
+ distclean-host: maybe-distclean-rcs
+-distclean-host: maybe-distclean-readline
+ distclean-host: maybe-distclean-release
+ distclean-host: maybe-distclean-recode
+ distclean-host: maybe-distclean-sed
+@@ -2199,7 +2187,6 @@
+ maintainer-clean-host: maybe-maintainer-clean-perl
+ maintainer-clean-host: maybe-maintainer-clean-prms
+ maintainer-clean-host: maybe-maintainer-clean-rcs
+-maintainer-clean-host: maybe-maintainer-clean-readline
+ maintainer-clean-host: maybe-maintainer-clean-release
+ maintainer-clean-host: maybe-maintainer-clean-recode
+ maintainer-clean-host: maybe-maintainer-clean-sed
+@@ -2359,7 +2346,6 @@
+ maybe-check-perl \
+ maybe-check-prms \
+ maybe-check-rcs \
+- maybe-check-readline \
+ maybe-check-release \
+ maybe-check-recode \
+ maybe-check-sed \
+@@ -2491,7 +2477,6 @@
+ maybe-install-perl \
+ maybe-install-prms \
+ maybe-install-rcs \
+- maybe-install-readline \
+ maybe-install-release \
+ maybe-install-recode \
+ maybe-install-sed \
+@@ -2564,7 +2549,6 @@
+ maybe-install-perl \
+ maybe-install-prms \
+ maybe-install-rcs \
+- maybe-install-readline \
+ maybe-install-release \
+ maybe-install-recode \
+ maybe-install-sed \
+@@ -51494,7 +51478,6 @@
+ all-gdb: maybe-all-intl
+ all-gdb: maybe-all-libiberty
+ all-gdb: maybe-all-opcodes
+-all-gdb: maybe-all-readline
+ all-gdb: maybe-all-build-bison
+ all-gdb: maybe-all-build-byacc
+ all-gdb: maybe-all-sim
+@@ -51826,7 +51809,6 @@
+ all-sim: maybe-all-libiberty
+ all-sim: maybe-all-bfd
+ all-sim: maybe-all-opcodes
+-all-sim: maybe-all-readline
+ all-sim: maybe-configure-gdb
+ all-fastjar: maybe-all-zlib
+ all-fastjar: maybe-all-build-texinfo