diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 11 | ||||
| -rw-r--r-- | gdb/config.in | 3 | ||||
| -rwxr-xr-x | gdb/configure | 33 | ||||
| -rw-r--r-- | gdb/configure.ac | 15 | ||||
| -rw-r--r-- | gdb/doc/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/doc/Makefile.in | 2 | ||||
| -rw-r--r-- | gdb/doc/gdb.texinfo | 6 | ||||
| -rw-r--r-- | gdb/tui/tui-io.c | 12 |
8 files changed, 28 insertions, 61 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ef7a45f..4a9cccf 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,14 @@ +2011-05-11 Jan Kratochvil <jan.kratochvil@redhat.com> + + * config.in: Regenerate. + * configure: Regenerate. + * configure.ac <--with-system-readline> (for readline_echoing_p): + Remove the test. + * tui/tui-io.c (tui_old_readline_echoing_p): Rename to ... + (tui_old_rl_echoing_p): ... here. + (tui_setup_io): Rename extern declaration readline_echoing_p to + _rl_echoing_p. Adjust assignments for the both renames. + 2011-05-11 Thiago Jung Bauermann <bauerman@br.ibm.com> * symtab.c (lookup_symtab): Run cleanup before returning. diff --git a/gdb/config.in b/gdb/config.in index db00195..c1d7c68 100644 --- a/gdb/config.in +++ b/gdb/config.in @@ -953,9 +953,6 @@ /* Define to `int' if <sys/types.h> does not define. */ #undef pid_t -/* readline-6.0 started to use different name. */ -#undef readline_echoing_p - /* Define to the equivalent of the C99 'restrict' keyword, or to nothing if this is not supported. Do not define if restrict is supported directly. */ diff --git a/gdb/configure b/gdb/configure index bf6ac01..ac143e4 100755 --- a/gdb/configure +++ b/gdb/configure @@ -9796,39 +9796,6 @@ if test "$with_system_readline" = yes; then READLINE_DEPS= READLINE_CFLAGS= READLINE_TEXI_INCFLAG= - - # readline-6.0 started to use the name `_rl_echoing_p'. - # `$(READLINE_DIR)/' of bundled readline would not resolve in configure. - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline_echoing_p" >&5 -$as_echo_n "checking for readline_echoing_p... " >&6; } - save_LIBS=$LIBS - LIBS="$LIBS $READLINE" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -extern int readline_echoing_p; - return readline_echoing_p; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - READLINE_ECHOING_P=yes -else - READLINE_ECHOING_P=no - -$as_echo "#define readline_echoing_p _rl_echoing_p" >>confdefs.h - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$save_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINE_ECHOING_P" >&5 -$as_echo "$READLINE_ECHOING_P" >&6; } else READLINE='$(READLINE_DIR)/libreadline.a' READLINE_DEPS='$(READLINE)' diff --git a/gdb/configure.ac b/gdb/configure.ac index a42ce27..8c12a44 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -562,21 +562,6 @@ if test "$with_system_readline" = yes; then READLINE_DEPS= READLINE_CFLAGS= READLINE_TEXI_INCFLAG= - - # readline-6.0 started to use the name `_rl_echoing_p'. - # `$(READLINE_DIR)/' of bundled readline would not resolve in configure. - - AC_MSG_CHECKING([for readline_echoing_p]) - save_LIBS=$LIBS - LIBS="$LIBS $READLINE" - AC_LINK_IFELSE(AC_LANG_PROGRAM(,[[extern int readline_echoing_p; - return readline_echoing_p;]]), - [READLINE_ECHOING_P=yes], - [READLINE_ECHOING_P=no - AC_DEFINE([readline_echoing_p], [_rl_echoing_p], - [readline-6.0 started to use different name.])]) - LIBS="$save_LIBS" - AC_MSG_RESULT([$READLINE_ECHOING_P]) else READLINE='$(READLINE_DIR)/libreadline.a' READLINE_DEPS='$(READLINE)' diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index 0dd6806..1a987ef 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,10 @@ +2011-05-11 Jan Kratochvil <jan.kratochvil@redhat.com> + + * Makefile.in (GDB_DOC_SOURCE_INCLUDES): Rename inc-hist.texinfo to + hsuser.texi. + * gdb.texinfo <!SYSTEM_READLINE>: Rename inc-hist.texinfo inclusion and + comment to hsuser.texi. Change rluser.texi name in the comment. + 2011-05-10 Doug Evans <dje@google.com> * gdb.texinfo (Threads): If an empty path is provided for diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in index b57f6a5..eef47a5 100644 --- a/gdb/doc/Makefile.in +++ b/gdb/doc/Makefile.in @@ -117,7 +117,7 @@ GDB_DOC_SOURCE_INCLUDES = \ $(srcdir)/gpl.texi \ $(srcdir)/agentexpr.texi \ $(READLINE_DIR)/rluser.texi \ - $(READLINE_DIR)/inc-hist.texinfo + $(READLINE_DIR)/hsuser.texi GDB_DOC_BUILD_INCLUDES = \ gdb-cfg.texi \ GDBvn.texi diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 9ccc48a..da2c784 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -31025,13 +31025,13 @@ things without first using the debugger to find the facts. @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 rluser.texi +@c hsuser.texi @c Use -I with makeinfo to point to the appropriate directory, @c environment var TEXINPUTS with TeX. @ifclear SYSTEM_READLINE @include rluser.texi -@include inc-hist.texinfo +@include hsuser.texi @end ifclear @node In Memoriam diff --git a/gdb/tui/tui-io.c b/gdb/tui/tui-io.c index e7b7370..afcd9f9 100644 --- a/gdb/tui/tui-io.c +++ b/gdb/tui/tui-io.c @@ -133,7 +133,7 @@ static Function *tui_old_rl_getc_function; static VFunction *tui_old_rl_redisplay_function; static VFunction *tui_old_rl_prep_terminal; static VFunction *tui_old_rl_deprep_terminal; -static int tui_old_readline_echoing_p; +static int tui_old_rl_echoing_p; /* Readline output stream. Should be removed when readline is clean. */ @@ -506,8 +506,8 @@ tui_rl_display_match_list (char **matches, int len, int max) void tui_setup_io (int mode) { - extern int readline_echoing_p; - + extern int _rl_echoing_p; + if (mode) { /* Redirect readline to TUI. */ @@ -516,12 +516,12 @@ tui_setup_io (int mode) tui_old_rl_prep_terminal = rl_prep_term_function; tui_old_rl_getc_function = rl_getc_function; tui_old_rl_outstream = rl_outstream; - tui_old_readline_echoing_p = readline_echoing_p; + tui_old_rl_echoing_p = _rl_echoing_p; rl_redisplay_function = tui_redisplay_readline; rl_deprep_term_function = tui_deprep_terminal; rl_prep_term_function = tui_prep_terminal; rl_getc_function = tui_getc; - readline_echoing_p = 0; + _rl_echoing_p = 0; rl_outstream = tui_rl_outstream; rl_prompt = 0; rl_completion_display_matches_hook = tui_rl_display_match_list; @@ -560,7 +560,7 @@ tui_setup_io (int mode) rl_getc_function = tui_old_rl_getc_function; rl_outstream = tui_old_rl_outstream; rl_completion_display_matches_hook = 0; - readline_echoing_p = tui_old_readline_echoing_p; + _rl_echoing_p = tui_old_rl_echoing_p; rl_already_prompted = 0; /* Save tty for SIGCONT. */ |