diff -Nrc2 readline-4.2a/CHANGELOG readline-4.3/CHANGELOG
*** readline-4.2a/CHANGELOG Fri Nov 2 11:42:09 2001
--- readline-4.3/CHANGELOG Mon May 20 12:55:41 2002
***************
*** 609,610 ****
--- 609,699 ----
Makefile.in, shlib/Makefile.in
- don't put -I$(includedir) into CFLAGS
+
+ 11/15
+ -----
+ [readline-4.2a released]
+
+ 11/20
+ -----
+ examples/rlcat.c
+ - new file
+
+ examples/Makefile.in
+ - changes for rlcat
+
+ 11/28
+ -----
+ configure.in
+ - default TERMCAP_LIB to -lcurses if $prefer_curses == yes (as when
+ --with-curses is supplied)
+
+ examples/Makefile.in
+ - substitute @LDFLAGS@ in LDFLAGS assignment
+
+ 11/29
+ -----
+ config.h.in
+ - add necessary defines for multibyte include files and functions
+ - add code to define HANDLE_MULTIBYTE if prerequisites are met
+
+ configure.in
+ - call BASH_CHECK_MULTIBYTE
+
+ 12/14
+ -----
+ config.h.in
+ - add #undef PROTOTYPES, filled in by AC_C_PROTOTYPES
+
+ 12/17
+ -----
+ config.h.in
+ - moved HANDLE_MULTIBYTE code to rlmbutil.h
+
+ rlmbutil.h, mbutil.c
+ - new files
+
+ Makefile.in, shlib/Makefile.in
+ - added rules for mbutil.c
+
+ 12/20
+ -----
+ configure.in
+ - added --enable-shared, --enable-static options to configure to
+ say which libraries are built by default (both default to yes)
+ - if SHLIB_STATUS == 'unsupported', turn off default shared library
+ building
+ - substitute new STATIC_TARGET, SHARED_TARGET, STATIC_INSTALL_TARGET,
+ and SHARED_INSTALL_TARGET
+
+ Makefile.in
+ - `all' target now depends on (substituted) @STATIC_TARGET@ and
+ @SHARED_TARGET@
+ - `install' target now depends on (substituted) @STATIC_INSTALL_TARGET@
+ and @SHARED_INSTALL_TARGET@
+
+ INSTALL, README
+ - updated with new info about --enable-shared and --enable-static
+
+ 1/10/2002
+ ---------
+ configure.in
+ - bumped the library version number to 4.3
+
+ 1/24
+ ----
+ Makefile.in,shlib/Makefile.in
+ - changes for new file, text.c, with character and text handling
+ functions from readline.c
+
+ 2/20
+ ----
+ {configure.config.h}.in
+ - call AC_C_CHAR_UNSIGNED, define __CHAR_UNSIGNED__ if chars are
+ unsigned by default
+
+ 5/20
+ ----
+ doc/Makefile.in
+ - new maybe-clean target that removes the generated documentation if
+ the build directory differs from the source directory
+ - distclean target now depends on maybe-clean
diff -Nrc2 readline-4.2a/CHANGES readline-4.3/CHANGES
*** readline-4.2a/CHANGES Wed Nov 7 17:00:32 2001
--- readline-4.3/CHANGES Tue Jul 9 15:53:40 2002
***************
*** 1,2 ****
--- 1,81 ----
+ This document details the changes between this version, readline-4.3,
+ and the previous version, readline-4.2a.
+
+ 1. Changes to Readline
+
+ a. Fixed output of comment-begin character when listing variable values.
+
+ b. Added some default key bindings for common escape sequences produced by
+ HOME and END keys.
+
+ c. Fixed the mark handling code to be more emacs-compatible.
+
+ d. A bug was fixed in the code that prints possible completions to keep it
+ from printing empty strings in certain circumstances.
+
+ e. Change the key sequence printing code to print ESC as M\- if ESC is a
+ meta-prefix character -- it's easier for users to understand than \e.
+
+ f. Fixed unstifle_history() to return values that match the documentation.
+
+ g. Fixed the event loop (rl_event_hook) to handle the case where the input
+ file descriptor is invalidated.
+
+ h. Fixed the prompt display code to work better when the application has a
+ custom redisplay function.
+
+ i. Changes to make reading and writing the history file a little faster, and
+ to cope with huge history files without calling abort(3) from xmalloc.
+
+ j. The vi-mode `S' and `s' commands are now undone correctly.
+
+ k. Fixed a problem which caused the display to be messed up when the last
+ line of a multi-line prompt (possibly containing invisible characters)
+ was longer than the screen width.
+
+ 2. New Features in Readline
+
+ a. Support for key `subsequences': allows, e.g., ESC and ESC-a to both
+ be bound to readline functions. Now the arrow keys may be used in vi
+ insert mode.
+
+ b. When listing completions, and the number of lines displayed is more than
+ the screen length, readline uses an internal pager to display the results.
+ This is controlled by the `page-completions' variable (default on).
+
+ c. New code to handle editing and displaying multibyte characters.
+
+ d. The behavior introduced in bash-2.05a of deciding whether or not to
+ append a slash to a completed name that is a symlink to a directory has
+ been made optional, controlled by the `mark-symlinked-directories'
+ variable (default is the 2.05a behavior).
+
+ e. The `insert-comment' command now acts as a toggle if given a numeric
+ argument: if the first characters on the line don't specify a
+ comment, insert one; if they do, delete the comment text
+
+ f. New application-settable completion variable:
+ rl_completion_mark_symlink_dirs, allows an application's completion
+ function to temporarily override the user's preference for appending
+ slashes to names which are symlinks to directories.
+
+ g. New function available to application completion functions:
+ rl_completion_mode, to tell how the completion function was invoked
+ and decide which argument to supply to rl_complete_internal (to list
+ completions, etc.).
+
+ h. Readline now has an overwrite mode, toggled by the `overwrite-mode'
+ bindable command, which could be bound to `Insert'.
+
+ i. New application-settable completion variable:
+ rl_completion_suppress_append, inhibits appending of
+ rl_completion_append_character to completed words.
+
+ j. New key bindings when reading an incremental search string: ^W yanks
+ the currently-matched word out of the current line into the search
+ string; ^Y yanks the rest of the current line into the search string,
+ DEL or ^H deletes characters from the search string.
+
+ -------------------------------------------------------------------------------
This document details the changes between this version, readline-4.2a,
and the previous version, readline-4.2.
diff -Nrc2 readline-4.2a/INSTALL readline-4.3/INSTALL
*** readline-4.2a/INSTALL Wed Aug 22 13:43:01 2001
--- readline-4.3/INSTALL Wed Jul 3 17:29:50 2002
***************
*** 2,6 ****
==================
! These are installation instructions for Readline 4.2a.
The simplest way to compile readline is:
--- 2,6 ----
==================
! These are installation instructions for Readline-4.3.
The simplest way to compile readline is:
***************
*** 15,26 ****
messages telling which features it is checking for.
! 2. Type `make' to compile readline and build the static libreadline
! and libhistory libraries. See below for instructions on compiling
the other parts of the distribution. Typing `make everything' will
cause the static and shared libraries (if supported) and the example
programs to be built.
! 3. Type `make install' to install the static libreadline and libhistory
! libraries, the readline include files, and the documentation.
4. You can remove the created libraries and object files from the
--- 15,28 ----
messages telling which features it is checking for.
! 2. Type `make' to compile readline and build the static readline
! and history libraries. If supported, the shared readline and history
! libraries will be built also. See below for instructions on compiling
the other parts of the distribution. Typing `make everything' will
cause the static and shared libraries (if supported) and the example
programs to be built.
! 3. Type `make install' to install the static readline and history
! libraries, the readline include files, the documentation, and, if
! supported, the shared readline and history libraries.
4. You can remove the created libraries and object files from the
***************
*** 53,57 ****
program called `autoconf'. You only need `configure.in' if you
want to change it or regenerate `configure' using a newer version
! of `autoconf'.
Compilers and Options
--- 55,60 ----
program called `autoconf'. You only need `configure.in' if you
want to change it or regenerate `configure' using a newer version
! of `autoconf'. The readline `configure.in' requires autoconf
! version 2.50 or newer.
Compilers and Options
***************
*** 162,166 ****
=================
! The readline `configure' takes a single `--with-PACKAGE' option:
`--with-curses'
--- 165,169 ----
=================
! The readline `configure' recognizes a single `--with-PACKAGE' option:
`--with-curses'
***************
*** 172,175 ****
--- 175,187 ----
This option tells readline to link the example programs with the
curses library rather than libtermcap.
+
+ `configure' also recognizes two `--enable-FEATURE' options:
+
+ `--enable-shared'
+ Build the shared libraries by default on supported platforms. The
+ default is `yes'.
+
+ `--enable-static'
+ Build the static libraries by default. The default is `yes'.
Shared Libraries
***************
*** 180,185 ****
the `shlib' subdirectory, and typing `make shared' will cause
shared versions of the readline and history libraries to be built
! on supported platforms. `make everything' will run `make shared'
! after building the static libraries.
Configure calls the script support/shobj-conf to test whether or
--- 192,199 ----
the `shlib' subdirectory, and typing `make shared' will cause
shared versions of the readline and history libraries to be built
! on supported platforms.
!
! If `configure' is given the `--enable-shared' option, it will attempt
! to build the shared libraries by default on supported platforms.
Configure calls the script support/shobj-conf to test whether or
***************
*** 243,256 ****
SHLIB_STATUS Set this to `supported' when you have defined the other
necessary variables. Make uses this to determine whether
! or not shared library creation should be attempted.
You should look at the existing stanzas in support/shobj-conf for ideas.
Once you have updated support/shobj-conf, re-run configure and type
! `make shared'. The shared libraries will be created in the shlib
! subdirectory.
! Since shared libraries are not created on all platforms, `make install'
! will not automatically install the shared libraries. To install them,
! change the current directory to shlib and type `make install'. Running
! `make install-shared' from the top-level build directory will also work.
--- 257,273 ----
SHLIB_STATUS Set this to `supported' when you have defined the other
necessary variables. Make uses this to determine whether
! or not shared library creation should be attempted. If
! shared libraries are not supported, this will be set to
! `unsupported'.
You should look at the existing stanzas in support/shobj-conf for ideas.
Once you have updated support/shobj-conf, re-run configure and type
! `make shared' or `make'. The shared libraries will be created in the
! shlib subdirectory.
! If shared libraries are created, `make install' will install them.
! You may install only the shared libraries by running `make
! install-shared' from the top-level build directory. Running `make
! install' in the shlib subdirectory will also work. If you don't want
! to install any created shared libraries, run `make install-static'.
diff -Nrc2 readline-4.2a/MANIFEST readline-4.3/MANIFEST
*** readline-4.2a/MANIFEST Mon Sep 24 08:40:53 2001
--- readline-4.3/MANIFEST Thu Jan 24 09:40:24 2002
***************
*** 29,32 ****
--- 29,33 ----
rlconf.h f
rldefs.h f
+ rlmbutil.h f
rlprivate.h f
rlshell.h f
***************
*** 39,42 ****
--- 40,44 ----
xmalloc.h f
bind.c f
+ callback.c f
compat.c f
complete.c f
***************
*** 49,52 ****
--- 51,56 ----
kill.c f
macro.c f
+ mbutil.c f
+ misc.c f
nls.c f
parens.c f
***************
*** 58,61 ****
--- 62,66 ----
signals.c f
terminal.c f
+ text.c f
tilde.c f
undo.c f
***************
*** 63,67 ****
vi_keymap.c f
vi_mode.c f
- callback.c f
xmalloc.c f
history.c f
--- 68,71 ----
***************
*** 77,80 ****
--- 81,85 ----
support/shobj-conf f
support/shlib-install f
+ support/wcwidth.c f
doc/Makefile.in f
doc/texinfo.tex f
***************
*** 96,99 ****
--- 101,105 ----
examples/manexamp.c f
examples/readlinebuf.h f
+ examples/rlcat.c f
examples/rlfe.c f
examples/rltest.c f
diff -Nrc2 readline-4.2a/Makefile.in readline-4.3/Makefile.in
*** readline-4.2a/Makefile.in Fri Nov 2 11:41:09 2001
--- readline-4.3/Makefile.in Thu Jan 24 10:15:24 2002
***************
*** 98,102 ****
$(srcdir)/histfile.c $(srcdir)/nls.c $(srcdir)/search.c \
$(srcdir)/shell.c $(srcdir)/savestring.c $(srcdir)/tilde.c \
! $(srcdir)/compat.c
# The header files for this library.
--- 98,103 ----
$(srcdir)/histfile.c $(srcdir)/nls.c $(srcdir)/search.c \
$(srcdir)/shell.c $(srcdir)/savestring.c $(srcdir)/tilde.c \
! $(srcdir)/text.c $(srcdir)/misc.c $(srcdir)/compat.c \
! $(srcdir)/mbutil.c
# The header files for this library.
***************
*** 104,115 ****
posixstat.h posixdir.h posixjmp.h tilde.h rlconf.h rltty.h \
ansi_stdlib.h tcap.h rlstdc.h xmalloc.h rlprivate.h rlshell.h \
! rltypedefs.h
! HISTOBJ = history.o histexpand.o histfile.o histsearch.o shell.o
TILDEOBJ = tilde.o
OBJECTS = readline.o vi_mode.o funmap.o keymaps.o parens.o search.o \
rltty.o complete.o bind.o isearch.o display.o signals.o \
util.o kill.o undo.o macro.o input.o callback.o terminal.o \
! nls.o compat.o xmalloc.o $(HISTOBJ) $(TILDEOBJ)
# The texinfo files which document this library.
--- 105,116 ----
posixstat.h posixdir.h posixjmp.h tilde.h rlconf.h rltty.h \
ansi_stdlib.h tcap.h rlstdc.h xmalloc.h rlprivate.h rlshell.h \
! rltypedefs.h rlmbutil.h
! HISTOBJ = history.o histexpand.o histfile.o histsearch.o shell.o mbutil.o
TILDEOBJ = tilde.o
OBJECTS = readline.o vi_mode.o funmap.o keymaps.o parens.o search.o \
rltty.o complete.o bind.o isearch.o display.o signals.o \
util.o kill.o undo.o macro.o input.o callback.o terminal.o \
! text.o nls.o misc.o compat.o xmalloc.o $(HISTOBJ) $(TILDEOBJ)
# The texinfo files which document this library.
***************
*** 128,135 ****
##########################################################################
! all: static
! everything: static shared examples
static: $(STATIC_LIBS)
--- 129,138 ----
##########################################################################
+ TARGETS = @STATIC_TARGET@ @SHARED_TARGET@
+ INSTALL_TARGETS = @STATIC_INSTALL_TARGET@ @SHARED_INSTALL_TARGET@
! all: $(TARGETS)
! everything: all examples
static: $(STATIC_LIBS)
***************
*** 203,207 ****
maybe-uninstall-headers: uninstall-headers
! install: installdirs $(STATIC_LIBS) install-headers
-$(MV) $(DESTDIR)$(libdir)/libreadline.a $(DESTDIR)$(libdir)/libreadline.old
$(INSTALL_DATA) libreadline.a $(DESTDIR)$(libdir)/libreadline.a
--- 206,212 ----
maybe-uninstall-headers: uninstall-headers
! install: $(INSTALL_TARGETS)
!
! install-static: installdirs $(STATIC_LIBS) install-headers
-$(MV) $(DESTDIR)$(libdir)/libreadline.a $(DESTDIR)$(libdir)/libreadline.old
$(INSTALL_DATA) libreadline.a $(DESTDIR)$(libdir)/libreadline.a
***************
*** 212,218 ****
-( if test -d doc ; then \
cd doc && \
! ${MAKE} ${MFLAGS} infodir=$(infodir) DESTDIR=${DESTDIR} $@; \
fi )
- -( cd shlib ; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} install )
installdirs: $(srcdir)/support/mkdirs
--- 217,222 ----
-( if test -d doc ; then \
cd doc && \
! ${MAKE} ${MFLAGS} infodir=$(infodir) DESTDIR=${DESTDIR} install; \
fi )
installdirs: $(srcdir)/support/mkdirs
***************
*** 330,333 ****
--- 334,342 ----
macro.o: readline.h keymaps.h rltypedefs.h chardefs.h tilde.h
macro.o: history.h rlstdc.h
+ mbutil.o: rldefs.h ${BUILD_DIR}/config.h rlconf.h
+ mbutil.o: readline.h keymaps.h rltypedefs.h chardefs.h rlstdc.h
+ misc.o: readline.h keymaps.h rltypedefs.h chardefs.h tilde.h
+ misc.o: rldefs.h ${BUILD_DIR}/config.h rlconf.h
+ misc.o: history.h rlstdc.h ansi_stdlib.h
nls.o: ansi_stdlib.h
nls.o: rldefs.h ${BUILD_DIR}/config.h rlconf.h
***************
*** 356,359 ****
--- 365,371 ----
terminal.o: readline.h keymaps.h rltypedefs.h chardefs.h tilde.h
terminal.o: history.h rlstdc.h
+ text.o: readline.h keymaps.h rltypedefs.h chardefs.h tilde.h
+ text.o: rldefs.h ${BUILD_DIR}/config.h rlconf.h
+ text.o: history.h rlstdc.h ansi_stdlib.h
tilde.o: ansi_stdlib.h
tilde.o: ${BUILD_DIR}/config.h
***************
*** 388,391 ****
--- 400,405 ----
kill.o: rlprivate.h
macro.o: rlprivate.h
+ mbutil.o: rlprivate.h
+ misc.o: rlprivate.h
nls.o: rlprivate.h
parens.o: rlprivate.h
***************
*** 395,398 ****
--- 409,413 ----
signals.o: rlprivate.h
terminal.o: rlprivate.h
+ text.o: rlprivate.h
undo.o: rlprivate.h
util.o: rlprivate.h
***************
*** 411,480 ****
kill.o: xmalloc.h
macro.o: xmalloc.h
readline.o: xmalloc.h
savestring.o: xmalloc.h
search.o: xmalloc.h
shell.o: xmalloc.h
tilde.o: xmalloc.h
! tilde.o: xmalloc.h
util.o: xmalloc.h
vi_mode.o: xmalloc.h
! readline.o: $(srcdir)/readline.c
! vi_mode.o: $(srcdir)/vi_mode.c
! funmap.o: $(srcdir)/funmap.c
! keymaps.o: $(srcdir)/keymaps.c
! parens.o: $(srcdir)/parens.c
! search.o: $(srcdir)/search.c
! rltty.o: $(srcdir)/rltty.c
compat.o: $(srcdir)/compat.c
complete.o: $(srcdir)/complete.c
- bind.o: $(srcdir)/bind.c
- isearch.o: $(srcdir)/isearch.c
display.o: $(srcdir)/display.c
! signals.o: $(srcdir)/signals.c
! util.o: $(srcdir)/util.c
kill.o: $(srcdir)/kill.c
- undo.o: $(srcdir)/undo.c
macro.o: $(srcdir)/macro.c
! input.o: $(srcdir)/input.c
! callback.o: $(srcdir)/callback.c
! terminal.o: $(srcdir)/terminal.c
nls.o: $(srcdir)/nls.c
xmalloc.o: $(srcdir)/xmalloc.c
! history.o: $(srcdir)/history.c
histexpand.o: $(srcdir)/histexpand.c
histfile.o: $(srcdir)/histfile.c
histsearch.o: $(srcdir)/histsearch.c
- savestring.o: $(srcdir)/savestring.c
- shell.o: $(srcdir)/shell.c
- tilde.o: $(srcdir)/tilde.c
! readline.o: readline.c
! vi_mode.o: vi_mode.c
! funmap.o: funmap.c
! keymaps.o: keymaps.c
! parens.o: parens.c
! search.o: search.c
! rltty.o: rltty.c
compat.o: compat.c
complete.o: complete.c
- bind.o: bind.c
- isearch.o: isearch.c
display.o: display.c
! signals.o: signals.c
! util.o: util.c
kill.o: kill.c
- undo.o: undo.c
macro.o: macro.c
! input.o: input.c
! callback.o: callback.c
! terminal.o: terminal.c
nls.o: nls.c
xmalloc.o: xmalloc.c
! history.o: history.c
histexpand.o: histexpand.c
histfile.o: histfile.c
histsearch.o: histsearch.c
- savestring.o: savestring.c
- shell.o: shell.c
- tilde.o: tilde.c
--- 426,520 ----
kill.o: xmalloc.h
macro.o: xmalloc.h
+ mbutil.o: xmalloc.h
+ misc.o: xmalloc.h
readline.o: xmalloc.h
savestring.o: xmalloc.h
search.o: xmalloc.h
shell.o: xmalloc.h
+ terminal.o: xmalloc.h
+ text.o: xmalloc.h
tilde.o: xmalloc.h
! undo.o: xmalloc.h
util.o: xmalloc.h
vi_mode.o: xmalloc.h
+ xmalloc.o: xmalloc.h
! complete.o: rlmbutil.h
! display.o: rlmbutil.h
! histexpand.o: rlmbutil.h
! input.o: rlmbutil.h
! isearch.o: rlmbutil.h
! mbutil.o: rlmbutil.h
! misc.o: rlmbutil.h
! readline.o: rlmbutil.h
! search.o: rlmbutil.h
! text.o: rlmbutil.h
! vi_mode.o: rlmbutil.h
!
! bind.o: $(srcdir)/bind.c
! callback.o: $(srcdir)/callback.c
compat.o: $(srcdir)/compat.c
complete.o: $(srcdir)/complete.c
display.o: $(srcdir)/display.c
! funmap.o: $(srcdir)/funmap.c
! input.o: $(srcdir)/input.c
! isearch.o: $(srcdir)/isearch.c
! keymaps.o: $(srcdir)/keymaps.c $(srcdir)/emacs_keymap.c $(srcdir)/vi_keymap.c
kill.o: $(srcdir)/kill.c
macro.o: $(srcdir)/macro.c
! mbutil.o: $(srcdir)/mbutil.c
! misc.o: $(srcdir)/misc.c
nls.o: $(srcdir)/nls.c
+ parens.o: $(srcdir)/parens.c
+ readline.o: $(srcdir)/readline.c
+ rltty.o: $(srcdir)/rltty.c
+ savestring.o: $(srcdir)/savestring.c
+ search.o: $(srcdir)/search.c
+ shell.o: $(srcdir)/shell.c
+ signals.o: $(srcdir)/signals.c
+ terminal.o: $(srcdir)/terminal.c
+ text.o: $(srcdir)/text.c
+ tilde.o: $(srcdir)/tilde.c
+ undo.o: $(srcdir)/undo.c
+ util.o: $(srcdir)/util.c
+ vi_mode.o: $(srcdir)/vi_mode.c
xmalloc.o: $(srcdir)/xmalloc.c
!
histexpand.o: $(srcdir)/histexpand.c
histfile.o: $(srcdir)/histfile.c
+ history.o: $(srcdir)/history.c
histsearch.o: $(srcdir)/histsearch.c
! bind.o: bind.c
! callback.o: callback.c
compat.o: compat.c
complete.o: complete.c
display.o: display.c
! funmap.o: funmap.c
! input.o: input.c
! isearch.o: isearch.c
! keymaps.o: keymaps.c emacs_keymap.c vi_keymap.c
kill.o: kill.c
macro.o: macro.c
! mbutil.o: mbutil.c
! misc.o: misc.c
nls.o: nls.c
+ parens.o: parens.c
+ readline.o: readline.c
+ rltty.o: rltty.c
+ savestring.o: savestring.c
+ search.o: search.c
+ shell.o: shell.c
+ signals.o: signals.c
+ terminal.o: terminal.c
+ text.o: text.c
+ tilde.o: tilde.c
+ undo.o: undo.c
+ util.o: util.c
+ vi_mode.o: vi_mode.c
xmalloc.o: xmalloc.c
!
histexpand.o: histexpand.c
histfile.o: histfile.c
+ history.o: history.c
histsearch.o: histsearch.c
diff -Nrc2 readline-4.2a/README readline-4.3/README
*** readline-4.2a/README Wed Aug 22 13:47:43 2001
--- readline-4.3/README Tue Apr 2 09:41:22 2002
***************
*** 2,6 ****
============
! This is the Gnu Readline library, version 4.2a.
The Readline library provides a set of functions for use by applications
--- 2,6 ----
============
! This is the Gnu Readline library, version 4.3.
The Readline library provides a set of functions for use by applications
***************
*** 58,61 ****
--- 58,64 ----
to be built on supported platforms.
+ If `configure' is given the `--enable-shared' option, it will attempt
+ to build the shared libraries by default on supported platforms.
+
Configure calls the script support/shobj-conf to test whether or
not shared library creation is supported and to generate the values
***************
*** 126,141 ****
subdirectory.
! Since shared libraries are not created on all platforms, `make install'
! will not automatically install the shared libraries. To install them,
! change the current directory to shlib and type `make install'. Running
! `make install-shared' from the top-level build directory will also work.
Documentation
=============
! The documentation for the Readline and History libraries appears in the
! `doc' subdirectory. There are two texinfo files and a Unix-style manual
! page describing the programming facilities available in the Readline
! library. The texinfo files include both user and programmer's manuals.
Reporting Bugs
--- 129,147 ----
subdirectory.
! If shared libraries are created, `make install' will install them.
! You may install only the shared libraries by running `make
! install-shared' from the top-level build directory. Running `make
! install' in the shlib subdirectory will also work. If you don't want
! to install any created shared libraries, run `make install-static'.
Documentation
=============
! The documentation for the Readline and History libraries appears in
! the `doc' subdirectory. There are three texinfo files and a
! Unix-style manual page describing the facilities available in the
! Readline library. The texinfo files include both user and
! programmer's manuals. HTML versions of the manuals appear in the
! `doc' subdirectory as well.
Reporting Bugs
diff -Nrc2 readline-4.2a/aclocal.m4 readline-4.3/aclocal.m4
*** readline-4.2a/aclocal.m4 Wed Nov 7 10:59:37 2001
--- readline-4.3/aclocal.m4 Tue Jun 25 09:45:43 2002
***************
*** 606,609 ****
--- 606,669 ----
])
+ # We should check for putenv before calling this
+ AC_DEFUN(BASH_FUNC_STD_PUTENV,
+ [
+ AC_REQUIRE([AC_HEADER_STDC])
+ AC_REQUIRE([AC_C_PROTOTYPES])
+ AC_CACHE_CHECK([for standard-conformant putenv declaration], bash_cv_std_putenv,
+ [AC_TRY_LINK([
+ #if STDC_HEADERS
+ #include
+ #include
+ #endif
+ #ifndef __STDC__
+ # ifndef const
+ # define const
+ # endif
+ #endif
+ #ifdef PROTOTYPES
+ extern int putenv (char *);
+ #else
+ extern int putenv ();
+ #endif
+ ],
+ [return (putenv == 0);],
+ bash_cv_std_putenv=yes, bash_cv_std_putenv=no
+ )])
+ if test $bash_cv_std_putenv = yes; then
+ AC_DEFINE(HAVE_STD_PUTENV)
+ fi
+ ])
+
+ # We should check for unsetenv before calling this
+ AC_DEFUN(BASH_FUNC_STD_UNSETENV,
+ [
+ AC_REQUIRE([AC_HEADER_STDC])
+ AC_REQUIRE([AC_C_PROTOTYPES])
+ AC_CACHE_CHECK([for standard-conformant unsetenv declaration], bash_cv_std_unsetenv,
+ [AC_TRY_LINK([
+ #if STDC_HEADERS
+ #include
+ #include
+ #endif
+ #ifndef __STDC__
+ # ifndef const
+ # define const
+ # endif
+ #endif
+ #ifdef PROTOTYPES
+ extern int unsetenv (const char *);
+ #else
+ extern int unsetenv ();
+ #endif
+ ],
+ [return (unsetenv == 0);],
+ bash_cv_std_unsetenv=yes, bash_cv_std_unsetenv=no
+ )])
+ if test $bash_cv_std_unsetenv = yes; then
+ AC_DEFINE(HAVE_STD_UNSETENV)
+ fi
+ ])
+
AC_DEFUN(BASH_FUNC_ULIMIT_MAXFDS,
[AC_MSG_CHECKING(whether ulimit can substitute for getdtablesize)
***************
*** 923,927 ****
AC_CACHE_VAL(bash_cv_termcap_lib,
[AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap,
! [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcal_lib=libtinfo,
[AC_CHECK_LIB(curses, tgetent, bash_cv_termcap_lib=libcurses,
[AC_CHECK_LIB(ncurses, tgetent, bash_cv_termcap_lib=libncurses,
--- 983,987 ----
AC_CACHE_VAL(bash_cv_termcap_lib,
[AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap,
! [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo,
[AC_CHECK_LIB(curses, tgetent, bash_cv_termcap_lib=libcurses,
[AC_CHECK_LIB(ncurses, tgetent, bash_cv_termcap_lib=libncurses,
***************
*** 1379,1386 ****
[if test -d /var/mail; then
bash_cv_mail_dir=/var/mail
- elif test -d /usr/mail; then
- bash_cv_mail_dir=/usr/mail
elif test -d /var/spool/mail; then
bash_cv_mail_dir=/var/spool/mail
elif test -d /usr/spool/mail; then
bash_cv_mail_dir=/usr/spool/mail
--- 1439,1446 ----
[if test -d /var/mail; then
bash_cv_mail_dir=/var/mail
elif test -d /var/spool/mail; then
bash_cv_mail_dir=/var/spool/mail
+ elif test -d /usr/mail; then
+ bash_cv_mail_dir=/usr/mail
elif test -d /usr/spool/mail; then
bash_cv_mail_dir=/usr/spool/mail
***************
*** 1390,1404 ****
])
AC_MSG_RESULT($bash_cv_mail_dir)
! if test $bash_cv_mail_dir = "/var/mail"; then
! AC_DEFINE(DEFAULT_MAIL_DIRECTORY, "/var/mail")
! elif test $bash_cv_mail_dir = "/usr/mail"; then
! AC_DEFINE(DEFAULT_MAIL_DIRECTORY, "/usr/mail")
! elif test $bash_cv_mail_dir = "/var/spool/mail"; then
! AC_DEFINE(DEFAULT_MAIL_DIRECTORY, "/var/spool/mail")
! elif test $bash_cv_mail_dir = "/usr/spool/mail"; then
! AC_DEFINE(DEFAULT_MAIL_DIRECTORY, "/usr/spool/mail")
! else
! AC_DEFINE(DEFAULT_MAIL_DIRECTORY, "unknown")
! fi
])
--- 1450,1454 ----
])
AC_MSG_RESULT($bash_cv_mail_dir)
! AC_DEFINE_UNQUOTED(DEFAULT_MAIL_DIRECTORY, "$bash_cv_mail_dir")
])
***************
*** 1594,1597 ****
--- 1644,1683 ----
])
+ dnl
+ dnl check for availability of multibyte characters and functions
+ dnl
+ AC_DEFUN(BASH_CHECK_MULTIBYTE,
+ [
+ AC_CHECK_HEADERS(wctype.h)
+ AC_CHECK_HEADERS(wchar.h)
+ AC_CHECK_HEADERS(langinfo.h)
+
+ AC_CHECK_FUNC(mbsrtowcs, AC_DEFINE(HAVE_MBSRTOWCS))
+ AC_CHECK_FUNC(wcwidth, AC_DEFINE(HAVE_WCWIDTH))
+
+ AC_CACHE_CHECK([for mbstate_t], bash_cv_have_mbstate_t,
+ [AC_TRY_RUN([
+ #include
+ int
+ main ()
+ {
+ mbstate_t ps;
+ return 0;
+ }], bash_cv_have_mbstate_t=yes, bash_cv_have_mbstate_t=no)])
+ if test $bash_cv_have_mbstate_t = yes; then
+ AC_DEFINE(HAVE_MBSTATE_T)
+ fi
+
+ AC_CACHE_CHECK([for nl_langinfo and CODESET], bash_cv_langinfo_codeset,
+ [AC_TRY_LINK(
+ [#include ],
+ [char* cs = nl_langinfo(CODESET);],
+ bash_cv_langinfo_codeset=yes, bash_cv_langinfo_codeset=no)])
+ if test $bash_cv_langinfo_codeset = yes; then
+ AC_DEFINE(HAVE_LANGINFO_CODESET)
+ fi
+
+ ])
+
dnl need: prefix exec_prefix libdir includedir CC TERMCAP_LIB
dnl require:
***************
*** 1656,1660 ****
2*|3*|4*|5*|6*|7*|8*|9*)
RL_MAJOR=`echo $ac_cv_rl_version | sed 's:\..*$::'`
! RL_MINOR=`echo $ac_cv_rl_version | sed -e 's:^.*\.::' -e 's:[a-zA-Z]*$::'`
;;
esac
--- 1742,1746 ----
2*|3*|4*|5*|6*|7*|8*|9*)
RL_MAJOR=`echo $ac_cv_rl_version | sed 's:\..*$::'`
! RL_MINOR=`echo $ac_cv_rl_version | sed -e 's:^.*\.::' -e 's:[[a-zA-Z]]*$::'`
;;
esac
diff -Nrc2 readline-4.2a/bind.c readline-4.3/bind.c
*** readline-4.2a/bind.c Mon Oct 15 14:30:43 2001
--- readline-4.3/bind.c Thu Jan 24 11:15:52 2002
***************
*** 69,72 ****
--- 69,74 ----
Keymap rl_binding_keymap;
+ static char *_rl_read_file PARAMS((char *, size_t *));
+ static void _rl_init_file_error PARAMS((const char *));
static int _rl_read_init_file PARAMS((const char *, int));
static int glean_key_from_name PARAMS((char *));
***************
*** 247,250 ****
--- 249,255 ----
int keys_len;
register int i;
+ KEYMAP_ENTRY k;
+
+ k.function = 0;
/* If no keys to bind to, exit right away. */
***************
*** 270,274 ****
for (i = 0; i < keys_len; i++)
{
! unsigned char ic = keys[i];
if (_rl_convert_meta_chars_to_ascii && META_CHAR (ic))
--- 275,284 ----
for (i = 0; i < keys_len; i++)
{
! unsigned char uc = keys[i];
! int ic;
!
! ic = uc;
! if (ic < 0 || ic >= KEYMAP_SIZE)
! return -1;
if (_rl_convert_meta_chars_to_ascii && META_CHAR (ic))
***************
*** 283,288 ****
if (map[ic].type != ISKMAP)
{
! if (map[ic].type == ISMACR)
! free ((char *)map[ic].function);
map[ic].type = ISKMAP;
--- 293,304 ----
if (map[ic].type != ISKMAP)
{
! /* We allow subsequences of keys. If a keymap is being
! created that will `shadow' an existing function or macro
! key binding, we save that keybinding into the ANYOTHERKEY
! index in the new map. The dispatch code will look there
! to find the function to execute if the subsequence is not
! matched. ANYOTHERKEY was chosen to be greater than
! UCHAR_MAX. */
! k = map[ic];
map[ic].type = ISKMAP;
***************
*** 290,293 ****
--- 306,320 ----
}
map = FUNCTION_TO_KEYMAP (map, ic);
+ /* The dispatch code will return this function if no matching
+ key sequence is found in the keymap. This (with a little
+ help from the dispatch code in readline.c) allows `a' to be
+ mapped to something, `abc' to be mapped to something else,
+ and the function bound to `a' to be executed when the user
+ types `abx', leaving `bx' in the input queue. */
+ if (k.function /* && k.type == ISFUNC */)
+ {
+ map[ANYOTHERKEY] = k;
+ k.function = 0;
+ }
}
else
***************
*** 295,298 ****
--- 322,330 ----
if (map[ic].type == ISMACR)
free ((char *)map[ic].function);
+ else if (map[ic].type == ISKMAP)
+ {
+ map = FUNCTION_TO_KEYMAP (map, ic);
+ ic = ANYOTHERKEY;
+ }
map[ic].function = KEYMAP_TO_FUNCTION (data);
***************
*** 332,336 ****
if (strncmp (&seq[i], "C-\\M-", 5) == 0)
{
! array[l++] = ESC;
i += 5;
array[l++] = CTRL (_rl_to_upper (seq[i]));
--- 364,368 ----
if (strncmp (&seq[i], "C-\\M-", 5) == 0)
{
! array[l++] = ESC; /* ESC is meta-prefix */
i += 5;
array[l++] = CTRL (_rl_to_upper (seq[i]));
***************
*** 341,345 ****
{
i++;
! array[l++] = ESC; /* XXX */
}
else if (c == 'C')
--- 373,377 ----
{
i++;
! array[l++] = ESC; /* ESC is meta-prefix */
}
else if (c == 'C')
***************
*** 633,641 ****
close (file);
- #if 0
- if (i < file_size)
- #else
if (i < 0)
- #endif
{
free (buffer);
--- 665,669 ----
***************
*** 643,655 ****
}
- #if 0
- buffer[file_size] = '\0';
- if (sizep)
- *sizep = file_size;
- #else
buffer[i] = '\0';
if (sizep)
*sizep = i;
- #endif
return (buffer);
--- 671,677 ----
***************
*** 768,772 ****
static void
_rl_init_file_error (msg)
! char *msg;
{
if (currently_reading_init_file)
--- 790,794 ----
static void
_rl_init_file_error (msg)
! const char *msg;
{
if (currently_reading_init_file)
***************
*** 1076,1080 ****
while (*var && whitespace (*var)) var++;
! /* Make value point to start of value string. */
value = var;
while (*value && !whitespace (*value)) value++;
--- 1098,1102 ----
while (*var && whitespace (*var)) var++;
! /* Make VALUE point to start of value string. */
value = var;
while (*value && !whitespace (*value)) value++;
***************
*** 1241,1244 ****
--- 1263,1267 ----
} boolean_varlist [] = {
{ "blink-matching-paren", &rl_blink_matching_paren, V_SPECIAL },
+ { "byte-oriented", &rl_byte_oriented, 0 },
{ "completion-ignore-case", &_rl_completion_case_fold, 0 },
{ "convert-meta", &_rl_convert_meta_chars_to_ascii, 0 },
***************
*** 1251,1257 ****
--- 1274,1282 ----
{ "mark-directories", &_rl_complete_mark_directories, 0 },
{ "mark-modified-lines", &_rl_mark_modified_lines, 0 },
+ { "mark-symlinked-directories", &_rl_complete_mark_symlink_dirs, 0 },
{ "match-hidden-files", &_rl_match_hidden_files, 0 },
{ "meta-flag", &_rl_meta_flag, 0 },
{ "output-meta", &_rl_output_meta_chars, 0 },
+ { "page-completions", &_rl_page_completions, 0 },
{ "prefer-visible-bell", &_rl_prefer_visible_bell, V_SPECIAL },
{ "print-completions-horizontally", &_rl_print_completions_horizontally, 0 },
***************
*** 1265,1269 ****
static int
find_boolean_var (name)
! char *name;
{
register int i;
--- 1290,1294 ----
static int
find_boolean_var (name)
! const char *name;
{
register int i;
***************
*** 1334,1338 ****
static int
find_string_var (name)
! char *name;
{
register int i;
--- 1359,1363 ----
static int
find_string_var (name)
! const char *name;
{
register int i;
***************
*** 1660,1664 ****
do any special meta processing on KEY. */
! #if 0
/* We might want to do this, but the old version of the code did not. */
--- 1685,1690 ----
do any special meta processing on KEY. */
! #if 1
! /* XXX - Experimental */
/* We might want to do this, but the old version of the code did not. */
***************
*** 1667,1674 ****
if (c == ESC)
{
! keyseq[0] = '\\';
! keyseq[1] = 'e';
! keyseq[2] = '\0';
! return keyseq;
}
#endif
--- 1693,1700 ----
if (c == ESC)
{
! keyname[0] = '\\';
! keyname[1] = 'e';
! keyname[2] = '\0';
! return keyname;
}
#endif
***************
*** 1781,1785 ****
--- 1807,1816 ----
if (key == ESC)
+ #if 0
sprintf (keyname, "\\e");
+ #else
+ /* XXX - experimental */
+ sprintf (keyname, "\\M-");
+ #endif
else if (CTRL_CHAR (key))
sprintf (keyname, "\\C-%c", _rl_to_lower (UNCTRL (key)));
***************
*** 1928,1936 ****
case ISMACR:
keyname = _rl_get_keyname (key);
- #if 0
- out = (char *)map[key].function;
- #else
out = _rl_untranslate_macro_value ((char *)map[key].function);
! #endif
if (print_readably)
fprintf (rl_outstream, "\"%s%s\": \"%s\"\n", prefix ? prefix : "",
--- 1959,1964 ----
case ISMACR:
keyname = _rl_get_keyname (key);
out = _rl_untranslate_macro_value ((char *)map[key].function);
!
if (print_readably)
fprintf (rl_outstream, "\"%s%s\": \"%s\"\n", prefix ? prefix : "",
***************
*** 1942,1948 ****
out ? out : "");
free (keyname);
- #if 1
free (out);
- #endif
break;
case ISFUNC:
--- 1970,1974 ----
***************
*** 2034,2038 ****
fprintf (rl_outstream, "set comment-begin %s\n", _rl_comment_begin ? _rl_comment_begin : RL_COMMENT_BEGIN_DEFAULT);
else
! fprintf (rl_outstream, "comment-begin is set to `%s'\n", _rl_comment_begin ? _rl_comment_begin : "");
/* completion-query-items */
--- 2060,2064 ----
fprintf (rl_outstream, "set comment-begin %s\n", _rl_comment_begin ? _rl_comment_begin : RL_COMMENT_BEGIN_DEFAULT);
else
! fprintf (rl_outstream, "comment-begin is set to `%s'\n", _rl_comment_begin ? _rl_comment_begin : RL_COMMENT_BEGIN_DEFAULT);
/* completion-query-items */
***************
*** 2048,2060 ****
fprintf (rl_outstream, "editing-mode is set to `%s'\n", (rl_editing_mode == emacs_mode) ? "emacs" : "vi");
- /* keymap */
- kname = rl_get_keymap_name (_rl_keymap);
- if (kname == 0)
- kname = rl_get_keymap_name_from_edit_mode ();
- if (print_readably)
- fprintf (rl_outstream, "set keymap %s\n", kname ? kname : "none");
- else
- fprintf (rl_outstream, "keymap is set to `%s'\n", kname ? kname : "none");
-
/* isearch-terminators */
if (_rl_isearch_terminators)
--- 2074,2077 ----
***************
*** 2071,2074 ****
--- 2088,2100 ----
free (disp);
}
+
+ /* keymap */
+ kname = rl_get_keymap_name (_rl_keymap);
+ if (kname == 0)
+ kname = rl_get_keymap_name_from_edit_mode ();
+ if (print_readably)
+ fprintf (rl_outstream, "set keymap %s\n", kname ? kname : "none");
+ else
+ fprintf (rl_outstream, "keymap is set to `%s'\n", kname ? kname : "none");
}
***************
*** 2087,2091 ****
}
! /* Bind key sequence KEYSEQ to DEFAULT_FUNC if KEYSEQ is unbound. */
void
_rl_bind_if_unbound (keyseq, default_func)
--- 2113,2119 ----
}
! /* Bind key sequence KEYSEQ to DEFAULT_FUNC if KEYSEQ is unbound. Right
! now, this is always used to attempt to bind the arrow keys, hence the
! check for rl_vi_movement_mode. */
void
_rl_bind_if_unbound (keyseq, default_func)
***************
*** 2098,2102 ****
--- 2126,2134 ----
{
func = rl_function_of_keyseq (keyseq, _rl_keymap, (int *)NULL);
+ #if defined (VI_MODE)
+ if (!func || func == rl_do_lowercase_version || func == rl_vi_movement_mode)
+ #else
if (!func || func == rl_do_lowercase_version)
+ #endif
rl_set_key (keyseq, default_func, _rl_keymap);
}
diff -Nrc2 readline-4.2a/chardefs.h readline-4.3/chardefs.h
*** readline-4.2a/chardefs.h Thu Nov 8 08:17:21 2001
--- readline-4.3/chardefs.h Thu Feb 14 11:38:18 2002
***************
*** 45,49 ****
#ifdef CTRL
! #undef CTRL
#endif
--- 45,52 ----
#ifdef CTRL
! # undef CTRL
! #endif
! #ifdef UNCTRL
! # undef UNCTRL
#endif
***************
*** 76,79 ****
--- 79,85 ----
#define NON_NEGATIVE(c) ((unsigned char)(c) == (c))
+
+ /* Some systems define these; we want our definitions. */
+ #undef ISPRINT
#define ISALNUM(c) (IN_CTYPE_DOMAIN (c) && isalnum (c))
diff -Nrc2 readline-4.2a/complete.c readline-4.3/complete.c
*** readline-4.2a/complete.c Mon Oct 15 14:31:41 2001
--- readline-4.3/complete.c Tue May 7 15:39:32 2002
***************
*** 56,59 ****
--- 56,60 ----
/* System-specific feature definitions and include files. */
#include "rldefs.h"
+ #include "rlmbutil.h"
/* Some standard library routines. */
***************
*** 101,108 ****
static char *rl_quote_filename PARAMS((char *, int, char *));
! static int get_y_or_n PARAMS((void));
static char *printable_part PARAMS((char *));
static int print_filename PARAMS((char *, char *));
- static char find_completion_word PARAMS((int *, int *));
static char **gen_completion_matches PARAMS((char *, int, int, rl_compentry_func_t *, int, int));
--- 102,110 ----
static char *rl_quote_filename PARAMS((char *, int, char *));
! static void set_completion_defaults PARAMS((int));
! static int get_y_or_n PARAMS((int));
! static int _rl_internal_pager PARAMS((int));
static char *printable_part PARAMS((char *));
static int print_filename PARAMS((char *, char *));
static char **gen_completion_matches PARAMS((char *, int, int, rl_compentry_func_t *, int, int));
***************
*** 117,121 ****
static char *make_quoted_replacement PARAMS((char *, int, char *));
- static void free_match_list PARAMS((char **));
/* **************************************************************** */
--- 119,122 ----
***************
*** 133,136 ****
--- 134,143 ----
int _rl_complete_mark_directories = 1;
+ /* If non-zero, the symlinked directory completion behavior introduced in
+ readline-4.2a is disabled, and symlinks that point to directories have
+ a slash appended (subject to the value of _rl_complete_mark_directories).
+ This is user-settable via the mark-symlinked-directories variable. */
+ int _rl_complete_mark_symlink_dirs = 0;
+
/* If non-zero, completions are printed horizontally in alphabetical order,
like `ls -x'. */
***************
*** 195,202 ****
int rl_completion_query_items = 100;
/* The basic list of characters that signal a break between words for the
completer routine. The contents of this variable is what breaks words
in the shell, i.e. " \t\n\"\\'`@$><=" */
! const char *rl_basic_word_break_characters = " \t\n\"\\'`@$><=;|&{(";
/* List of basic quoting characters. */
--- 202,211 ----
int rl_completion_query_items = 100;
+ int _rl_page_completions = 1;
+
/* The basic list of characters that signal a break between words for the
completer routine. The contents of this variable is what breaks words
in the shell, i.e. " \t\n\"\\'`@$><=" */
! const char *rl_basic_word_break_characters = " \t\n\"\\'`@$><=;|&{("; /* }) */
/* List of basic quoting characters. */
***************
*** 265,272 ****
--- 274,297 ----
rl_linebuf_func_t *rl_char_is_quoted_p = (rl_linebuf_func_t *)NULL;
+ /* If non-zero, the completion functions don't append anything except a
+ possible closing quote. This is set to 0 by rl_complete_internal and
+ may be changed by an application-specific completion function. */
+ int rl_completion_suppress_append = 0;
+
/* Character appended to completed words when at the end of the line. The
default is a space. */
int rl_completion_append_character = ' ';
+ /* If non-zero, a slash will be appended to completed filenames that are
+ symbolic links to directory names, subject to the value of the
+ mark-directories variable (which is user-settable). This exists so
+ that application completion functions can override the user's preference
+ (set via the mark-symlinked-directories variable) if appropriate.
+ It's set to the value of _rl_complete_mark_symlink_dirs in
+ rl_complete_internal before any application-specific completion
+ function is called, so without that function doing anything, the user's
+ preferences are honored. */
+ int rl_completion_mark_symlink_dirs;
+
/* If non-zero, inhibit completion (temporarily). */
int rl_inhibit_completion;
***************
*** 291,295 ****
{
if (rl_inhibit_completion)
! return (rl_insert (ignore, invoking_key));
else if (rl_last_func == rl_complete && !completion_changed_buffer)
return (rl_complete_internal ('?'));
--- 316,320 ----
{
if (rl_inhibit_completion)
! return (_rl_insert_char (ignore, invoking_key));
else if (rl_last_func == rl_complete && !completion_changed_buffer)
return (rl_complete_internal ('?'));
***************
*** 315,318 ****
--- 340,360 ----
}
+ /* Return the correct value to pass to rl_complete_internal performing
+ the same tests as rl_complete. This allows consecutive calls to an
+ application's completion function to list possible completions and for
+ an application-specific completion function to honor the
+ show-all-if-ambiguous readline variable. */
+ int
+ rl_completion_mode (cfunc)
+ rl_command_func_t *cfunc;
+ {
+ if (rl_last_func == cfunc && !completion_changed_buffer)
+ return '?';
+ else if (_rl_complete_show_all)
+ return '!';
+ else
+ return TAB;
+ }
+
/************************************/
/* */
***************
*** 321,327 ****
/************************************/
/* The user must press "y" or "n". Non-zero return means "y" pressed. */
static int
! get_y_or_n ()
{
int c;
--- 363,386 ----
/************************************/
+ /* Set default values for readline word completion. These are the variables
+ that application completion functions can change or inspect. */
+ static void
+ set_completion_defaults (what_to_do)
+ int what_to_do;
+ {
+ /* Only the completion entry function can change these. */
+ rl_filename_completion_desired = 0;
+ rl_filename_quoting_desired = 1;
+ rl_completion_type = what_to_do;
+ rl_completion_suppress_append = 0;
+
+ /* The completion entry function may optionally change this. */
+ rl_completion_mark_symlink_dirs = _rl_complete_mark_symlink_dirs;
+ }
+
/* The user must press "y" or "n". Non-zero return means "y" pressed. */
static int
! get_y_or_n (for_pager)
! int for_pager;
{
int c;
***************
*** 339,346 ****
--- 398,427 ----
if (c == ABORT_CHAR)
_rl_abort_internal ();
+ if (for_pager && (c == NEWLINE || c == RETURN))
+ return (2);
+ if (for_pager && (c == 'q' || c == 'Q'))
+ return (0);
rl_ding ();
}
}
+ static int
+ _rl_internal_pager (lines)
+ int lines;
+ {
+ int i;
+
+ fprintf (rl_outstream, "--More--");
+ fflush (rl_outstream);
+ i = get_y_or_n (1);
+ _rl_erase_entire_line ();
+ if (i == 0)
+ return -1;
+ else if (i == 2)
+ return (lines - 1);
+ else
+ return 0;
+ }
+
#if defined (VISIBLE_STATS)
/* Return the character which best describes FILENAME.
***************
*** 403,419 ****
possible completions. If we are hacking filename completion, we
are only interested in the basename, the portion following the
! final slash. Otherwise, we return what we were passed. */
static char *
printable_part (pathname)
char *pathname;
{
! char *temp;
! temp = rl_filename_completion_desired ? strrchr (pathname, '/') : (char *)NULL;
#if defined (__MSDOS__)
! if (rl_filename_completion_desired && temp == 0 && ISALPHA ((unsigned char)pathname[0]) && pathname[1] == ':')
temp = pathname + 1;
#endif
! return (temp ? ++temp : pathname);
}
--- 484,522 ----
possible completions. If we are hacking filename completion, we
are only interested in the basename, the portion following the
! final slash. Otherwise, we return what we were passed. Since
! printing empty strings is not very informative, if we're doing
! filename completion, and the basename is the empty string, we look
! for the previous slash and return the portion following that. If
! there's no previous slash, we just return what we were passed. */
static char *
printable_part (pathname)
char *pathname;
{
! char *temp, *x;
!
! if (rl_filename_completion_desired == 0) /* don't need to do anything */
! return (pathname);
! temp = strrchr (pathname, '/');
#if defined (__MSDOS__)
! if (temp == 0 && ISALPHA ((unsigned char)pathname[0]) && pathname[1] == ':')
temp = pathname + 1;
#endif
!
! if (temp == 0 || *temp == '\0')
! return (pathname);
! /* If the basename is NULL, we might have a pathname like '/usr/src/'.
! Look for a previous slash and, if one is found, return the portion
! following that slash. If there's no previous slash, just return the
! pathname we were passed. */
! else if (temp[1] == '\0')
! {
! for (x = temp - 1; x > pathname; x--)
! if (*x == '/')
! break;
! return ((*x == '/') ? x + 1 : pathname);
! }
! else
! return ++temp;
}
***************
*** 544,549 ****
the value of the delimiter character that caused a word break. */
! static char
! find_completion_word (fp, dp)
int *fp, *dp;
{
--- 647,652 ----
the value of the delimiter character that caused a word break. */
! char
! _rl_find_completion_word (fp, dp)
int *fp, *dp;
{
***************
*** 600,603 ****
--- 703,708 ----
else if (quote_char == '"')
found_quote |= RL_QF_DOUBLE_QUOTE;
+ else
+ found_quote |= RL_QF_OTHER_QUOTE;
}
}
***************
*** 609,613 ****
--- 714,722 ----
completion, so use the word break characters to find the
substring on which to complete. */
+ #if defined (HANDLE_MULTIBYTE)
+ while (rl_point = _rl_find_prev_mbchar (rl_line_buffer, rl_point, MB_FIND_ANY))
+ #else
while (--rl_point)
+ #endif
{
scan = rl_line_buffer[rl_point];
***************
*** 781,784 ****
--- 890,898 ----
register int i, c1, c2, si;
int low; /* Count of max-matched characters. */
+ #if defined (HANDLE_MULTIBYTE)
+ int v;
+ mbstate_t ps1, ps2;
+ wchar_t wc1, wc2;
+ #endif
/* If only one match, just use that. Otherwise, compare each
***************
*** 794,797 ****
--- 908,918 ----
for (i = 1, low = 100000; i < matches; i++)
{
+ #if defined (HANDLE_MULTIBYTE)
+ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+ {
+ memset (&ps1, 0, sizeof (mbstate_t));
+ memset (&ps2, 0, sizeof (mbstate_t));
+ }
+ #endif
if (_rl_completion_case_fold)
{
***************
*** 800,803 ****
--- 921,938 ----
(c2 = _rl_to_lower(match_list[i + 1][si]));
si++)
+ #if defined (HANDLE_MULTIBYTE)
+ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+ {
+ v = mbrtowc (&wc1, match_list[i]+si, strlen (match_list[i]+si), &ps1);
+ mbrtowc (&wc2, match_list[i+1]+si, strlen (match_list[i+1]+si), &ps2);
+ wc1 = towlower (wc1);
+ wc2 = towlower (wc2);
+ if (wc1 != wc2)
+ break;
+ else if (v > 1)
+ si += v - 1;
+ }
+ else
+ #endif
if (c1 != c2)
break;
***************
*** 809,812 ****
--- 944,958 ----
(c2 = match_list[i + 1][si]);
si++)
+ #if defined (HANDLE_MULTIBYTE)
+ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+ {
+ mbstate_t ps_back = ps1;
+ if (!_rl_compare_chars (match_list[i], si, &ps1, match_list[i+1], si, &ps2))
+ break;
+ else if ((v = _rl_get_char_len (&match_list[i][si], &ps_back)) > 1)
+ si += v - 1;
+ }
+ else
+ #endif
if (c1 != c2)
break;
***************
*** 829,832 ****
--- 975,980 ----
match_list[0] = (char *)xmalloc (low + 1);
+ /* XXX - this might need changes in the presence of multibyte chars */
+
/* If we are ignoring case, try to preserve the case of the string
the user typed in the face of multiple matches differing in case. */
***************
*** 872,875 ****
--- 1020,1026 ----
matches = *matchesp;
+ if (matches == 0)
+ return 0;
+
/* It seems to me that in all the cases we handle we would like
to ignore duplicate possiblilities. Scan for the text to
***************
*** 924,928 ****
int len, max;
{
! int count, limit, printed_len;
int i, j, k, l;
char *temp;
--- 1075,1079 ----
int len, max;
{
! int count, limit, printed_len, lines;
int i, j, k, l;
char *temp;
***************
*** 952,955 ****
--- 1103,1107 ----
rl_crlf ();
+ lines = 0;
if (_rl_print_completions_horizontally == 0)
{
***************
*** 973,976 ****
--- 1125,1135 ----
}
rl_crlf ();
+ lines++;
+ if (_rl_page_completions && lines >= (_rl_screenheight - 1) && i < count)
+ {
+ lines = _rl_internal_pager (lines);
+ if (lines < 0)
+ return;
+ }
}
}
***************
*** 986,990 ****
{
if (i && (limit > 1) && (i % limit) == 0)
! rl_crlf ();
else
for (k = 0; k < max - printed_len; k++)
--- 1145,1158 ----
{
if (i && (limit > 1) && (i % limit) == 0)
! {
! rl_crlf ();
! lines++;
! if (_rl_page_completions && lines >= _rl_screenheight - 1)
! {
! lines = _rl_internal_pager (lines);
! if (lines < 0)
! return;
! }
! }
else
for (k = 0; k < max - printed_len; k++)
***************
*** 1058,1062 ****
fprintf (rl_outstream, "Display all %d possibilities? (y or n)", len);
fflush (rl_outstream);
! if (get_y_or_n () == 0)
{
rl_crlf ();
--- 1226,1230 ----
fprintf (rl_outstream, "Display all %d possibilities? (y or n)", len);
fflush (rl_outstream);
! if (get_y_or_n (0) == 0)
{
rl_crlf ();
***************
*** 1156,1160 ****
appended. If NONTRIVIAL_MATCH is set, we test for a symlink (if the OS
has them) and don't add a suffix for a symlink to a directory. A
! nontrivial match is one that actually adds to the word being completed. */
static int
append_to_match (text, delimiter, quote_char, nontrivial_match)
--- 1324,1332 ----
appended. If NONTRIVIAL_MATCH is set, we test for a symlink (if the OS
has them) and don't add a suffix for a symlink to a directory. A
! nontrivial match is one that actually adds to the word being completed.
! The variable rl_completion_mark_symlink_dirs controls this behavior
! (it's initially set to the what the user has chosen, indicated by the
! value of _rl_complete_mark_symlink_dirs, but may be modified by an
! application's completion function). */
static int
append_to_match (text, delimiter, quote_char, nontrivial_match)
***************
*** 1172,1176 ****
if (delimiter)
temp_string[temp_string_index++] = delimiter;
! else if (rl_completion_append_character)
temp_string[temp_string_index++] = rl_completion_append_character;
--- 1344,1348 ----
if (delimiter)
temp_string[temp_string_index++] = delimiter;
! else if (rl_completion_suppress_append == 0 && rl_completion_append_character)
temp_string[temp_string_index++] = rl_completion_append_character;
***************
*** 1180,1188 ****
{
filename = tilde_expand (text);
! s = nontrivial_match ? LSTAT (filename, &finfo) : stat (filename, &finfo);
if (s == 0 && S_ISDIR (finfo.st_mode))
{
! if (_rl_complete_mark_directories && rl_line_buffer[rl_point] != '/')
! rl_insert_text ("/");
}
#ifdef S_ISLNK
--- 1352,1370 ----
{
filename = tilde_expand (text);
! s = (nontrivial_match && rl_completion_mark_symlink_dirs == 0)
! ? LSTAT (filename, &finfo)
! : stat (filename, &finfo);
if (s == 0 && S_ISDIR (finfo.st_mode))
{
! if (_rl_complete_mark_directories)
! {
! /* This is clumsy. Avoid putting in a double slash if point
! is at the end of the line and the previous character is a
! slash. */
! if (rl_point && rl_line_buffer[rl_point] == '\0' && rl_line_buffer[rl_point - 1] == '/')
! ;
! else if (rl_line_buffer[rl_point] != '/')
! rl_insert_text ("/");
! }
}
#ifdef S_ISLNK
***************
*** 1195,1199 ****
else
{
! if (rl_point == rl_end)
rl_insert_text (temp_string);
}
--- 1377,1381 ----
else
{
! if (rl_point == rl_end && temp_string_index)
rl_insert_text (temp_string);
}
***************
*** 1202,1206 ****
else
{
! if (rl_point == rl_end)
rl_insert_text (temp_string);
}
--- 1384,1388 ----
else
{
! if (rl_point == rl_end && temp_string_index)
rl_insert_text (temp_string);
}
***************
*** 1248,1257 ****
}
! static void
! free_match_list (matches)
char **matches;
{
register int i;
for (i = 0; matches[i]; i++)
free (matches[i]);
--- 1430,1442 ----
}
! void
! _rl_free_match_list (matches)
char **matches;
{
register int i;
+ if (matches == 0)
+ return;
+
for (i = 0; matches[i]; i++)
free (matches[i]);
***************
*** 1277,1284 ****
RL_SETSTATE(RL_STATE_COMPLETING);
! /* Only the completion entry function can change these. */
! rl_filename_completion_desired = 0;
! rl_filename_quoting_desired = 1;
! rl_completion_type = what_to_do;
saved_line_buffer = rl_line_buffer ? savestring (rl_line_buffer) : (char *)NULL;
--- 1462,1467 ----
RL_SETSTATE(RL_STATE_COMPLETING);
!
! set_completion_defaults (what_to_do);
saved_line_buffer = rl_line_buffer ? savestring (rl_line_buffer) : (char *)NULL;
***************
*** 1295,1299 ****
/* This (possibly) changes rl_point. If it returns a non-zero char,
we know we have an open quote. */
! quote_char = find_completion_word (&found_quote, &delimiter);
start = rl_point;
--- 1478,1482 ----
/* This (possibly) changes rl_point. If it returns a non-zero char,
we know we have an open quote. */
! quote_char = _rl_find_completion_word (&found_quote, &delimiter);
start = rl_point;
***************
*** 1311,1314 ****
--- 1494,1498 ----
rl_ding ();
FREE (saved_line_buffer);
+ completion_changed_buffer = 0;
RL_UNSETSTATE(RL_STATE_COMPLETING);
return (0);
***************
*** 1376,1380 ****
}
! free_match_list (matches);
/* Check to see if the line has changed through all of this manipulation. */
--- 1560,1564 ----
}
! _rl_free_match_list (matches);
/* Check to see if the line has changed through all of this manipulation. */
***************
*** 1736,1740 ****
FREE (orig_text);
if (matches)
! free_match_list (matches);
match_list_index = match_list_size = 0;
--- 1920,1924 ----
FREE (orig_text);
if (matches)
! _rl_free_match_list (matches);
match_list_index = match_list_size = 0;
***************
*** 1742,1748 ****
/* Only the completion entry function can change these. */
! rl_filename_completion_desired = 0;
! rl_filename_quoting_desired = 1;
! rl_completion_type = '%';
our_func = rl_completion_entry_function
--- 1926,1930 ----
/* Only the completion entry function can change these. */
! set_completion_defaults ('%');
our_func = rl_completion_entry_function
***************
*** 1758,1762 ****
/* This (possibly) changes rl_point. If it returns a non-zero char,
we know we have an open quote. */
! quote_char = find_completion_word (&found_quote, &delimiter);
orig_start = rl_point;
--- 1940,1944 ----
/* This (possibly) changes rl_point. If it returns a non-zero char,
we know we have an open quote. */
! quote_char = _rl_find_completion_word (&found_quote, &delimiter);
orig_start = rl_point;
diff -Nrc2 readline-4.2a/config.h.in readline-4.3/config.h.in
*** readline-4.2a/config.h.in Mon Oct 29 10:21:04 2001
--- readline-4.3/config.h.in Wed Feb 20 10:04:55 2002
***************
*** 14,17 ****
--- 14,21 ----
#undef ssize_t
+ #undef PROTOTYPES
+
+ #undef __CHAR_UNSIGNED__
+
/* Define if the `S_IS*' macros in do not work properly. */
#undef STAT_MACROS_BROKEN
***************
*** 28,31 ****
--- 32,38 ----
#undef HAVE_LSTAT
+ /* Define if you have the mbsrtowcs function. */
+ #undef HAVE_MBSRTOWCS
+
/* Define if you have the memmove function. */
#undef HAVE_MEMMOVE
***************
*** 46,49 ****
--- 53,61 ----
#undef HAVE_STRCASECMP
+ /* Define if you have the strcoll function. */
+ #undef HAVE_STRCOLL
+
+ #undef STRCOLL_BROKEN
+
/* Define if you have the strpbrk function. */
#undef HAVE_STRPBRK
***************
*** 55,69 ****
#undef HAVE_VSNPRINTF
! /* Define if you have the strcoll function. */
! #undef HAVE_STRCOLL
!
! #undef STRCOLL_BROKEN
/* Define if you have the header file. */
#undef HAVE_DIRENT_H
/* Define if you have the header file. */
#undef HAVE_NDIR_H
/* Define if you have the header file. */
#undef HAVE_STDLIB_H
--- 67,94 ----
#undef HAVE_VSNPRINTF
! /* Define if you have the wcwidth function. */
! #undef HAVE_WCWIDTH
/* Define if you have the header file. */
#undef HAVE_DIRENT_H
+ /* Define if you have the header file. */
+ #undef HAVE_LANGINFO_H
+
+ /* Define if you have the header file. */
+ #undef HAVE_LIMITS_H
+
+ /* Define if you have the header file. */
+ #undef HAVE_LOCALE_H
+
+ /* Define if you have the header file. */
+ #undef HAVE_MEMORY_H
+
/* Define if you have the header file. */
#undef HAVE_NDIR_H
+ /* Define if you have the header file. */
+ #undef HAVE_STDARG_H
+
/* Define if you have the header file. */
#undef HAVE_STDLIB_H
***************
*** 111,122 ****
#undef HAVE_VARARGS_H
! /* Define if you have the header file. */
! #undef HAVE_STDARG_H
! #undef HAVE_LOCALE_H
! #undef HAVE_LIMITS_H
! #undef HAVE_MEMORY_H
/* Definitions pulled in from aclocal.m4. */
--- 136,149 ----
#undef HAVE_VARARGS_H
! /* Define if you have the header file. */
! #undef HAVE_WCHAR_H
! /* Define if you have the header file. */
! #undef HAVE_WCTYPE_H
! #undef HAVE_MBSTATE_T
! /* Define if you have and nl_langinfo(CODESET). */
! #undef HAVE_LANGINFO_CODESET
/* Definitions pulled in from aclocal.m4. */
diff -Nrc2 readline-4.2a/configure readline-4.3/configure
*** readline-4.2a/configure Mon Nov 12 11:49:27 2001
--- readline-4.3/configure Thu Jun 27 13:54:29 2002
***************
*** 1,6 ****
#! /bin/sh
! # From configure.in for Readline 4.2a, version 2.40, from autoconf version 2.52.
# Guess values for system-dependent variables and create Makefiles.
! # Generated by Autoconf 2.52 for readline 4.2a.
#
# Report bugs to .
--- 1,6 ----
#! /bin/sh
! # From configure.in for Readline 4.3, version 2.45, from autoconf version 2.52.
# Guess values for system-dependent variables and create Makefiles.
! # Generated by Autoconf 2.52 for readline 4.3.
#
# Report bugs to .
***************
*** 187,192 ****
PACKAGE_NAME='readline'
PACKAGE_TARNAME='readline'
! PACKAGE_VERSION='4.2a'
! PACKAGE_STRING='readline 4.2a'
PACKAGE_BUGREPORT='bug-readline@gnu.org'
--- 187,192 ----
PACKAGE_NAME='readline'
PACKAGE_TARNAME='readline'
! PACKAGE_VERSION='4.3'
! PACKAGE_STRING='readline 4.3'
PACKAGE_BUGREPORT='bug-readline@gnu.org'
***************
*** 605,609 ****
# This message is too long to be a string in the A/UX 3.1 sh.
cat <&5
echo "$as_me: loading site script $ac_site_file" >&6;}
cat "$ac_site_file" >&5
--- 877,881 ----
for ac_site_file in $CONFIG_SITE; do
if test -r "$ac_site_file"; then
! { echo "$as_me:879: loading site script $ac_site_file" >&5
echo "$as_me: loading site script $ac_site_file" >&6;}
cat "$ac_site_file" >&5
***************
*** 881,885 ****
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
! { echo "$as_me:883: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
--- 888,892 ----
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
! { echo "$as_me:890: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
***************
*** 889,893 ****
fi
else
! { echo "$as_me:891: creating cache $cache_file" >&5
echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
--- 896,900 ----
fi
else
! { echo "$as_me:898: creating cache $cache_file" >&5
echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
***************
*** 905,913 ****
case $ac_old_set,$ac_new_set in
set,)
! { echo "$as_me:907: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
! { echo "$as_me:911: error: \`$ac_var' was not set in the previous run" >&5
echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
--- 912,920 ----
case $ac_old_set,$ac_new_set in
set,)
! { echo "$as_me:914: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
! { echo "$as_me:918: error: \`$ac_var' was not set in the previous run" >&5
echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
***************
*** 915,923 ****
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
! { echo "$as_me:917: error: \`$ac_var' has changed since the previous run:" >&5
echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
! { echo "$as_me:919: former value: $ac_old_val" >&5
echo "$as_me: former value: $ac_old_val" >&2;}
! { echo "$as_me:921: current value: $ac_new_val" >&5
echo "$as_me: current value: $ac_new_val" >&2;}
ac_cache_corrupted=:
--- 922,930 ----
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
! { echo "$as_me:924: error: \`$ac_var' has changed since the previous run:" >&5
echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
! { echo "$as_me:926: former value: $ac_old_val" >&5
echo "$as_me: former value: $ac_old_val" >&2;}
! { echo "$as_me:928: current value: $ac_new_val" >&5
echo "$as_me: current value: $ac_new_val" >&2;}
ac_cache_corrupted=:
***************
*** 938,944 ****
done
if $ac_cache_corrupted; then
! { echo "$as_me:940: error: changes in the environment can compromise the build" >&5
echo "$as_me: error: changes in the environment can compromise the build" >&2;}
! { { echo "$as_me:942: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
{ (exit 1); exit 1; }; }
--- 945,951 ----
done
if $ac_cache_corrupted; then
! { echo "$as_me:947: error: changes in the environment can compromise the build" >&5
echo "$as_me: error: changes in the environment can compromise the build" >&2;}
! { { echo "$as_me:949: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
{ (exit 1); exit 1; }; }
***************
*** 960,967 ****
echo "exit 0" >>conftest.sh
chmod +x conftest.sh
! if { (echo "$as_me:962: PATH=\".;.\"; conftest.sh") >&5
(PATH=".;."; conftest.sh) 2>&5
ac_status=$?
! echo "$as_me:965: \$? = $ac_status" >&5
(exit $ac_status); }; then
ac_path_separator=';'
--- 967,974 ----
echo "exit 0" >>conftest.sh
chmod +x conftest.sh
! if { (echo "$as_me:969: PATH=\".;.\"; conftest.sh") >&5
(PATH=".;."; conftest.sh) 2>&5
ac_status=$?
! echo "$as_me:972: \$? = $ac_status" >&5
(exit $ac_status); }; then
ac_path_separator=';'
***************
*** 989,993 ****
done
if test -z "$ac_aux_dir"; then
! { { echo "$as_me:991: error: cannot find install-sh or install.sh in ./support $srcdir/./support" >&5
echo "$as_me: error: cannot find install-sh or install.sh in ./support $srcdir/./support" >&2;}
{ (exit 1); exit 1; }; }
--- 996,1000 ----
done
if test -z "$ac_aux_dir"; then
! { { echo "$as_me:998: error: cannot find install-sh or install.sh in ./support $srcdir/./support" >&5
echo "$as_me: error: cannot find install-sh or install.sh in ./support $srcdir/./support" >&2;}
{ (exit 1); exit 1; }; }
***************
*** 999,1011 ****
ac_config_headers="$ac_config_headers config.h"
! LIBVERSION=4.2a
# Make sure we can run config.sub.
$ac_config_sub sun4 >/dev/null 2>&1 ||
! { { echo "$as_me:1005: error: cannot run $ac_config_sub" >&5
echo "$as_me: error: cannot run $ac_config_sub" >&2;}
{ (exit 1); exit 1; }; }
! echo "$as_me:1009: checking build system type" >&5
echo $ECHO_N "checking build system type... $ECHO_C" >&6
if test "${ac_cv_build+set}" = set; then
--- 1006,1018 ----
ac_config_headers="$ac_config_headers config.h"
! LIBVERSION=4.3
# Make sure we can run config.sub.
$ac_config_sub sun4 >/dev/null 2>&1 ||
! { { echo "$as_me:1012: error: cannot run $ac_config_sub" >&5
echo "$as_me: error: cannot run $ac_config_sub" >&2;}
{ (exit 1); exit 1; }; }
! echo "$as_me:1016: checking build system type" >&5
echo $ECHO_N "checking build system type... $ECHO_C" >&6
if test "${ac_cv_build+set}" = set; then
***************
*** 1016,1029 ****
ac_cv_build_alias=`$ac_config_guess`
test -z "$ac_cv_build_alias" &&
! { { echo "$as_me:1018: error: cannot guess build type; you must specify one" >&5
echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
{ (exit 1); exit 1; }; }
ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
! { { echo "$as_me:1022: error: $ac_config_sub $ac_cv_build_alias failed." >&5
echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
{ (exit 1); exit 1; }; }
fi
! echo "$as_me:1027: result: $ac_cv_build" >&5
echo "${ECHO_T}$ac_cv_build" >&6
build=$ac_cv_build
--- 1023,1036 ----
ac_cv_build_alias=`$ac_config_guess`
test -z "$ac_cv_build_alias" &&
! { { echo "$as_me:1025: error: cannot guess build type; you must specify one" >&5
echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
{ (exit 1); exit 1; }; }
ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
! { { echo "$as_me:1029: error: $ac_config_sub $ac_cv_build_alias failed." >&5
echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
{ (exit 1); exit 1; }; }
fi
! echo "$as_me:1034: result: $ac_cv_build" >&5
echo "${ECHO_T}$ac_cv_build" >&6
build=$ac_cv_build
***************
*** 1032,1036 ****
build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
! echo "$as_me:1034: checking host system type" >&5
echo $ECHO_N "checking host system type... $ECHO_C" >&6
if test "${ac_cv_host+set}" = set; then
--- 1039,1043 ----
build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
! echo "$as_me:1041: checking host system type" >&5
echo $ECHO_N "checking host system type... $ECHO_C" >&6
if test "${ac_cv_host+set}" = set; then
***************
*** 1041,1050 ****
ac_cv_host_alias=$ac_cv_build_alias
ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
! { { echo "$as_me:1043: error: $ac_config_sub $ac_cv_host_alias failed" >&5
echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
{ (exit 1); exit 1; }; }
fi
! echo "$as_me:1048: result: $ac_cv_host" >&5
echo "${ECHO_T}$ac_cv_host" >&6
host=$ac_cv_host
--- 1048,1057 ----
ac_cv_host_alias=$ac_cv_build_alias
ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
! { { echo "$as_me:1050: error: $ac_config_sub $ac_cv_host_alias failed" >&5
echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
{ (exit 1); exit 1; }; }
fi
! echo "$as_me:1055: result: $ac_cv_host" >&5
echo "${ECHO_T}$ac_cv_host" >&6
host=$ac_cv_host
***************
*** 1054,1058 ****
opt_curses=no
- opt_shared=no
# Check whether --with-curses or --without-curses was given.
--- 1061,1064 ----
***************
*** 1066,1069 ****
--- 1072,1089 ----
fi
+ opt_static_libs=yes
+ opt_shared_libs=yes
+
+ # Check whether --enable-shared or --disable-shared was given.
+ if test "${enable_shared+set}" = set; then
+ enableval="$enable_shared"
+ opt_shared_libs=$enableval
+ fi;
+ # Check whether --enable-static or --disable-static was given.
+ if test "${enable_static+set}" = set; then
+ enableval="$enable_static"
+ opt_static_libs=$enableval
+ fi;
+
echo ""
echo "Beginning configuration for readline-$LIBVERSION for ${host_cpu}-${host_vendor}-${host_os}"
***************
*** 1073,1077 ****
test -z "$CFLAGS" && CFLAGS=-g auto_cflags=1
! echo "$as_me:1075: checking whether ${MAKE-make} sets \${MAKE}" >&5
echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
--- 1093,1097 ----
test -z "$CFLAGS" && CFLAGS=-g auto_cflags=1
! echo "$as_me:1095: checking whether ${MAKE-make} sets \${MAKE}" >&5
echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
***************
*** 1093,1101 ****
fi
if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
! echo "$as_me:1095: result: yes" >&5
echo "${ECHO_T}yes" >&6
SET_MAKE=
else
! echo "$as_me:1099: result: no" >&5
echo "${ECHO_T}no" >&6
SET_MAKE="MAKE=${MAKE-make}"
--- 1113,1121 ----
fi
if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
! echo "$as_me:1115: result: yes" >&5
echo "${ECHO_T}yes" >&6
SET_MAKE=
else
! echo "$as_me:1119: result: no" >&5
echo "${ECHO_T}no" >&6
SET_MAKE="MAKE=${MAKE-make}"
***************
*** 1110,1114 ****
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
! echo "$as_me:1112: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_CC+set}" = set; then
--- 1130,1134 ----
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
! echo "$as_me:1132: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_CC+set}" = set; then
***************
*** 1125,1129 ****
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_CC="${ac_tool_prefix}gcc"
! echo "$as_me:1127: found $ac_dir/$ac_word" >&5
break
done
--- 1145,1149 ----
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_CC="${ac_tool_prefix}gcc"
! echo "$as_me:1147: found $ac_dir/$ac_word" >&5
break
done
***************
*** 1133,1140 ****
CC=$ac_cv_prog_CC
if test -n "$CC"; then
! echo "$as_me:1135: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
! echo "$as_me:1138: result: no" >&5
echo "${ECHO_T}no" >&6
fi
--- 1153,1160 ----
CC=$ac_cv_prog_CC
if test -n "$CC"; then
! echo "$as_me:1155: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
! echo "$as_me:1158: result: no" >&5
echo "${ECHO_T}no" >&6
fi
***************
*** 1145,1149 ****
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
! echo "$as_me:1147: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
--- 1165,1169 ----
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
! echo "$as_me:1167: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
***************
*** 1160,1164 ****
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_CC="gcc"
! echo "$as_me:1162: found $ac_dir/$ac_word" >&5
break
done
--- 1180,1184 ----
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_CC="gcc"
! echo "$as_me:1182: found $ac_dir/$ac_word" >&5
break
done
***************
*** 1168,1175 ****
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
! echo "$as_me:1170: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6
else
! echo "$as_me:1173: result: no" >&5
echo "${ECHO_T}no" >&6
fi
--- 1188,1195 ----
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
! echo "$as_me:1190: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6
else
! echo "$as_me:1193: result: no" >&5
echo "${ECHO_T}no" >&6
fi
***************
*** 1184,1188 ****
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
! echo "$as_me:1186: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_CC+set}" = set; then
--- 1204,1208 ----
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
! echo "$as_me:1206: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_CC+set}" = set; then
***************
*** 1199,1203 ****
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_CC="${ac_tool_prefix}cc"
! echo "$as_me:1201: found $ac_dir/$ac_word" >&5
break
done
--- 1219,1223 ----
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_CC="${ac_tool_prefix}cc"
! echo "$as_me:1221: found $ac_dir/$ac_word" >&5
break
done
***************
*** 1207,1214 ****
CC=$ac_cv_prog_CC
if test -n "$CC"; then
! echo "$as_me:1209: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
! echo "$as_me:1212: result: no" >&5
echo "${ECHO_T}no" >&6
fi
--- 1227,1234 ----
CC=$ac_cv_prog_CC
if test -n "$CC"; then
! echo "$as_me:1229: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
! echo "$as_me:1232: result: no" >&5
echo "${ECHO_T}no" >&6
fi
***************
*** 1219,1223 ****
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
! echo "$as_me:1221: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
--- 1239,1243 ----
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
! echo "$as_me:1241: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
***************
*** 1234,1238 ****
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_CC="cc"
! echo "$as_me:1236: found $ac_dir/$ac_word" >&5
break
done
--- 1254,1258 ----
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_CC="cc"
! echo "$as_me:1256: found $ac_dir/$ac_word" >&5
break
done
***************
*** 1242,1249 ****
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
! echo "$as_me:1244: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6
else
! echo "$as_me:1247: result: no" >&5
echo "${ECHO_T}no" >&6
fi
--- 1262,1269 ----
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
! echo "$as_me:1264: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6
else
! echo "$as_me:1267: result: no" >&5
echo "${ECHO_T}no" >&6
fi
***************
*** 1258,1262 ****
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
! echo "$as_me:1260: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_CC+set}" = set; then
--- 1278,1282 ----
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
! echo "$as_me:1280: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_CC+set}" = set; then
***************
*** 1278,1282 ****
fi
ac_cv_prog_CC="cc"
! echo "$as_me:1280: found $ac_dir/$ac_word" >&5
break
done
--- 1298,1302 ----
fi
ac_cv_prog_CC="cc"
! echo "$as_me:1300: found $ac_dir/$ac_word" >&5
break
done
***************
*** 1300,1307 ****
CC=$ac_cv_prog_CC
if test -n "$CC"; then
! echo "$as_me:1302: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
! echo "$as_me:1305: result: no" >&5
echo "${ECHO_T}no" >&6
fi
--- 1320,1327 ----
CC=$ac_cv_prog_CC
if test -n "$CC"; then
! echo "$as_me:1322: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
! echo "$as_me:1325: result: no" >&5
echo "${ECHO_T}no" >&6
fi
***************
*** 1314,1318 ****
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
! echo "$as_me:1316: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_CC+set}" = set; then
--- 1334,1338 ----
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
! echo "$as_me:1336: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_CC+set}" = set; then
***************
*** 1329,1333 ****
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
! echo "$as_me:1331: found $ac_dir/$ac_word" >&5
break
done
--- 1349,1353 ----
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
! echo "$as_me:1351: found $ac_dir/$ac_word" >&5
break
done
***************
*** 1337,1344 ****
CC=$ac_cv_prog_CC
if test -n "$CC"; then
! echo "$as_me:1339: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
! echo "$as_me:1342: result: no" >&5
echo "${ECHO_T}no" >&6
fi
--- 1357,1364 ----
CC=$ac_cv_prog_CC
if test -n "$CC"; then
! echo "$as_me:1359: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
! echo "$as_me:1362: result: no" >&5
echo "${ECHO_T}no" >&6
fi
***************
*** 1353,1357 ****
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
! echo "$as_me:1355: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
--- 1373,1377 ----
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
! echo "$as_me:1375: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
***************
*** 1368,1372 ****
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_CC="$ac_prog"
! echo "$as_me:1370: found $ac_dir/$ac_word" >&5
break
done
--- 1388,1392 ----
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_CC="$ac_prog"
! echo "$as_me:1390: found $ac_dir/$ac_word" >&5
break
done
***************
*** 1376,1383 ****
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
! echo "$as_me:1378: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6
else
! echo "$as_me:1381: result: no" >&5
echo "${ECHO_T}no" >&6
fi
--- 1396,1403 ----
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
! echo "$as_me:1398: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6
else
! echo "$as_me:1401: result: no" >&5
echo "${ECHO_T}no" >&6
fi
***************
*** 1391,1420 ****
fi
! test -z "$CC" && { { echo "$as_me:1393: error: no acceptable cc found in \$PATH" >&5
echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
! echo "$as_me:1398:" \
"checking for C compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
! { (eval echo "$as_me:1401: \"$ac_compiler --version &5\"") >&5
(eval $ac_compiler --version &5) 2>&5
ac_status=$?
! echo "$as_me:1404: \$? = $ac_status" >&5
(exit $ac_status); }
! { (eval echo "$as_me:1406: \"$ac_compiler -v &5\"") >&5
(eval $ac_compiler -v &5) 2>&5
ac_status=$?
! echo "$as_me:1409: \$? = $ac_status" >&5
(exit $ac_status); }
! { (eval echo "$as_me:1411: \"$ac_compiler -V &5\"") >&5
(eval $ac_compiler -V &5) 2>&5
ac_status=$?
! echo "$as_me:1414: \$? = $ac_status" >&5
(exit $ac_status); }
cat >conftest.$ac_ext <<_ACEOF
! #line 1418 "configure"
#include "confdefs.h"
--- 1411,1440 ----
fi
! test -z "$CC" && { { echo "$as_me:1413: error: no acceptable cc found in \$PATH" >&5
echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
! echo "$as_me:1418:" \
"checking for C compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
! { (eval echo "$as_me:1421: \"$ac_compiler --version &5\"") >&5
(eval $ac_compiler --version &5) 2>&5
ac_status=$?
! echo "$as_me:1424: \$? = $ac_status" >&5
(exit $ac_status); }
! { (eval echo "$as_me:1426: \"$ac_compiler -v &5\"") >&5
(eval $ac_compiler -v &5) 2>&5
ac_status=$?
! echo "$as_me:1429: \$? = $ac_status" >&5
(exit $ac_status); }
! { (eval echo "$as_me:1431: \"$ac_compiler -V &5\"") >&5
(eval $ac_compiler -V &5) 2>&5
ac_status=$?
! echo "$as_me:1434: \$? = $ac_status" >&5
(exit $ac_status); }
cat >conftest.$ac_ext <<_ACEOF
! #line 1438 "configure"
#include "confdefs.h"
***************
*** 1432,1442 ****
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
! echo "$as_me:1434: checking for C compiler default output" >&5
echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
! if { (eval echo "$as_me:1437: \"$ac_link_default\"") >&5
(eval $ac_link_default) 2>&5
ac_status=$?
! echo "$as_me:1440: \$? = $ac_status" >&5
(exit $ac_status); }; then
# Find the output, starting from the most likely. This scheme is
--- 1452,1462 ----
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
! echo "$as_me:1454: checking for C compiler default output" >&5
echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
! if { (eval echo "$as_me:1457: \"$ac_link_default\"") >&5
(eval $ac_link_default) 2>&5
ac_status=$?
! echo "$as_me:1460: \$? = $ac_status" >&5
(exit $ac_status); }; then
# Find the output, starting from the most likely. This scheme is
***************
*** 1461,1465 ****
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
! { { echo "$as_me:1463: error: C compiler cannot create executables" >&5
echo "$as_me: error: C compiler cannot create executables" >&2;}
{ (exit 77); exit 77; }; }
--- 1481,1485 ----
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
! { { echo "$as_me:1483: error: C compiler cannot create executables" >&5
echo "$as_me: error: C compiler cannot create executables" >&2;}
{ (exit 77); exit 77; }; }
***************
*** 1467,1476 ****
ac_exeext=$ac_cv_exeext
! echo "$as_me:1469: result: $ac_file" >&5
echo "${ECHO_T}$ac_file" >&6
# Check the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
! echo "$as_me:1474: checking whether the C compiler works" >&5
echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
--- 1487,1496 ----
ac_exeext=$ac_cv_exeext
! echo "$as_me:1489: result: $ac_file" >&5
echo "${ECHO_T}$ac_file" >&6
# Check the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
! echo "$as_me:1494: checking whether the C compiler works" >&5
echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
***************
*** 1478,1485 ****
if test "$cross_compiling" != yes; then
if { ac_try='./$ac_file'
! { (eval echo "$as_me:1480: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:1483: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cross_compiling=no
--- 1498,1505 ----
if test "$cross_compiling" != yes; then
if { ac_try='./$ac_file'
! { (eval echo "$as_me:1500: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:1503: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cross_compiling=no
***************
*** 1488,1492 ****
cross_compiling=yes
else
! { { echo "$as_me:1490: error: cannot run C compiled programs.
If you meant to cross compile, use \`--host'." >&5
echo "$as_me: error: cannot run C compiled programs.
--- 1508,1512 ----
cross_compiling=yes
else
! { { echo "$as_me:1510: error: cannot run C compiled programs.
If you meant to cross compile, use \`--host'." >&5
echo "$as_me: error: cannot run C compiled programs.
***************
*** 1496,1500 ****
fi
fi
! echo "$as_me:1498: result: yes" >&5
echo "${ECHO_T}yes" >&6
--- 1516,1520 ----
fi
fi
! echo "$as_me:1518: result: yes" >&5
echo "${ECHO_T}yes" >&6
***************
*** 1503,1517 ****
# Check the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
! echo "$as_me:1505: checking whether we are cross compiling" >&5
echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
! echo "$as_me:1507: result: $cross_compiling" >&5
echo "${ECHO_T}$cross_compiling" >&6
! echo "$as_me:1510: checking for executable suffix" >&5
echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
! if { (eval echo "$as_me:1512: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:1515: \$? = $ac_status" >&5
(exit $ac_status); }; then
# If both `conftest.exe' and `conftest' are `present' (well, observable)
--- 1523,1537 ----
# Check the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
! echo "$as_me:1525: checking whether we are cross compiling" >&5
echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
! echo "$as_me:1527: result: $cross_compiling" >&5
echo "${ECHO_T}$cross_compiling" >&6
! echo "$as_me:1530: checking for executable suffix" >&5
echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
! if { (eval echo "$as_me:1532: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:1535: \$? = $ac_status" >&5
(exit $ac_status); }; then
# If both `conftest.exe' and `conftest' are `present' (well, observable)
***************
*** 1529,1533 ****
done
else
! { { echo "$as_me:1531: error: cannot compute EXEEXT: cannot compile and link" >&5
echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
{ (exit 1); exit 1; }; }
--- 1549,1553 ----
done
else
! { { echo "$as_me:1551: error: cannot compute EXEEXT: cannot compile and link" >&5
echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
{ (exit 1); exit 1; }; }
***************
*** 1535,1539 ****
rm -f conftest$ac_cv_exeext
! echo "$as_me:1537: result: $ac_cv_exeext" >&5
echo "${ECHO_T}$ac_cv_exeext" >&6
--- 1555,1559 ----
rm -f conftest$ac_cv_exeext
! echo "$as_me:1557: result: $ac_cv_exeext" >&5
echo "${ECHO_T}$ac_cv_exeext" >&6
***************
*** 1541,1545 ****
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
! echo "$as_me:1543: checking for object suffix" >&5
echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
if test "${ac_cv_objext+set}" = set; then
--- 1561,1565 ----
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
! echo "$as_me:1563: checking for object suffix" >&5
echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
if test "${ac_cv_objext+set}" = set; then
***************
*** 1547,1551 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 1549 "configure"
#include "confdefs.h"
--- 1567,1571 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 1569 "configure"
#include "confdefs.h"
***************
*** 1559,1566 ****
_ACEOF
rm -f conftest.o conftest.obj
! if { (eval echo "$as_me:1561: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:1564: \$? = $ac_status" >&5
(exit $ac_status); }; then
for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
--- 1579,1586 ----
_ACEOF
rm -f conftest.o conftest.obj
! if { (eval echo "$as_me:1581: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:1584: \$? = $ac_status" >&5
(exit $ac_status); }; then
for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
***************
*** 1574,1578 ****
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
! { { echo "$as_me:1576: error: cannot compute OBJEXT: cannot compile" >&5
echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
{ (exit 1); exit 1; }; }
--- 1594,1598 ----
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
! { { echo "$as_me:1596: error: cannot compute OBJEXT: cannot compile" >&5
echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
{ (exit 1); exit 1; }; }
***************
*** 1581,1589 ****
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
! echo "$as_me:1583: result: $ac_cv_objext" >&5
echo "${ECHO_T}$ac_cv_objext" >&6
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
! echo "$as_me:1587: checking whether we are using the GNU C compiler" >&5
echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
if test "${ac_cv_c_compiler_gnu+set}" = set; then
--- 1601,1609 ----
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
! echo "$as_me:1603: result: $ac_cv_objext" >&5
echo "${ECHO_T}$ac_cv_objext" >&6
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
! echo "$as_me:1607: checking whether we are using the GNU C compiler" >&5
echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
if test "${ac_cv_c_compiler_gnu+set}" = set; then
***************
*** 1591,1595 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 1593 "configure"
#include "confdefs.h"
--- 1611,1615 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 1613 "configure"
#include "confdefs.h"
***************
*** 1606,1619 ****
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:1608: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:1611: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:1614: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:1617: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_compiler_gnu=yes
--- 1626,1639 ----
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:1628: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:1631: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:1634: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:1637: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_compiler_gnu=yes
***************
*** 1627,1631 ****
fi
! echo "$as_me:1629: result: $ac_cv_c_compiler_gnu" >&5
echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
GCC=`test $ac_compiler_gnu = yes && echo yes`
--- 1647,1651 ----
fi
! echo "$as_me:1649: result: $ac_cv_c_compiler_gnu" >&5
echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
GCC=`test $ac_compiler_gnu = yes && echo yes`
***************
*** 1633,1637 ****
ac_save_CFLAGS=$CFLAGS
CFLAGS="-g"
! echo "$as_me:1635: checking whether $CC accepts -g" >&5
echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
if test "${ac_cv_prog_cc_g+set}" = set; then
--- 1653,1657 ----
ac_save_CFLAGS=$CFLAGS
CFLAGS="-g"
! echo "$as_me:1655: checking whether $CC accepts -g" >&5
echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
if test "${ac_cv_prog_cc_g+set}" = set; then
***************
*** 1639,1643 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 1641 "configure"
#include "confdefs.h"
--- 1659,1663 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 1661 "configure"
#include "confdefs.h"
***************
*** 1651,1664 ****
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:1653: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:1656: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:1659: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:1662: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_prog_cc_g=yes
--- 1671,1684 ----
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:1673: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:1676: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:1679: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:1682: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_prog_cc_g=yes
***************
*** 1670,1674 ****
rm -f conftest.$ac_objext conftest.$ac_ext
fi
! echo "$as_me:1672: result: $ac_cv_prog_cc_g" >&5
echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
if test "$ac_test_CFLAGS" = set; then
--- 1690,1694 ----
rm -f conftest.$ac_objext conftest.$ac_ext
fi
! echo "$as_me:1692: result: $ac_cv_prog_cc_g" >&5
echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
if test "$ac_test_CFLAGS" = set; then
***************
*** 1697,1710 ****
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:1699: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:1702: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:1705: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:1708: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
for ac_declaration in \
--- 1717,1730 ----
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:1719: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:1722: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:1725: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:1728: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
for ac_declaration in \
***************
*** 1718,1722 ****
do
cat >conftest.$ac_ext <<_ACEOF
! #line 1720 "configure"
#include "confdefs.h"
#include
--- 1738,1742 ----
do
cat >conftest.$ac_ext <<_ACEOF
! #line 1740 "configure"
#include "confdefs.h"
#include
***************
*** 1731,1744 ****
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:1733: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:1736: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:1739: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:1742: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
--- 1751,1764 ----
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:1753: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:1756: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:1759: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:1762: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
***************
*** 1750,1754 ****
rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
! #line 1752 "configure"
#include "confdefs.h"
$ac_declaration
--- 1770,1774 ----
rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
! #line 1772 "configure"
#include "confdefs.h"
$ac_declaration
***************
*** 1762,1775 ****
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:1764: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:1767: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:1770: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:1773: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
--- 1782,1795 ----
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:1784: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:1787: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:1790: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:1793: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
***************
*** 1803,1807 ****
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
! echo "$as_me:1805: checking how to run the C preprocessor" >&5
echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
# On Suns, sometimes $CPP names a directory.
--- 1823,1827 ----
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
! echo "$as_me:1825: checking how to run the C preprocessor" >&5
echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
# On Suns, sometimes $CPP names a directory.
***************
*** 1824,1833 ****
# not just through cpp. "Syntax error" is here to catch this case.
cat >conftest.$ac_ext <<_ACEOF
! #line 1826 "configure"
#include "confdefs.h"
#include
Syntax error
_ACEOF
! if { (eval echo "$as_me:1831: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
--- 1844,1853 ----
# not just through cpp. "Syntax error" is here to catch this case.
cat >conftest.$ac_ext <<_ACEOF
! #line 1846 "configure"
#include "confdefs.h"
#include
Syntax error
_ACEOF
! if { (eval echo "$as_me:1851: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
***************
*** 1835,1839 ****
rm -f conftest.er1
cat conftest.err >&5
! echo "$as_me:1837: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
--- 1855,1859 ----
rm -f conftest.er1
cat conftest.err >&5
! echo "$as_me:1857: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
***************
*** 1858,1866 ****
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
! #line 1860 "configure"
#include "confdefs.h"
#include
_ACEOF
! if { (eval echo "$as_me:1864: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
--- 1878,1886 ----
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
! #line 1880 "configure"
#include "confdefs.h"
#include
_ACEOF
! if { (eval echo "$as_me:1884: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
***************
*** 1868,1872 ****
rm -f conftest.er1
cat conftest.err >&5
! echo "$as_me:1870: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
--- 1888,1892 ----
rm -f conftest.er1
cat conftest.err >&5
! echo "$as_me:1890: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
***************
*** 1905,1909 ****
ac_cv_prog_CPP=$CPP
fi
! echo "$as_me:1907: result: $CPP" >&5
echo "${ECHO_T}$CPP" >&6
ac_preproc_ok=false
--- 1925,1929 ----
ac_cv_prog_CPP=$CPP
fi
! echo "$as_me:1927: result: $CPP" >&5
echo "${ECHO_T}$CPP" >&6
ac_preproc_ok=false
***************
*** 1915,1924 ****
# not just through cpp. "Syntax error" is here to catch this case.
cat >conftest.$ac_ext <<_ACEOF
! #line 1917 "configure"
#include "confdefs.h"
#include
Syntax error
_ACEOF
! if { (eval echo "$as_me:1922: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
--- 1935,1944 ----
# not just through cpp. "Syntax error" is here to catch this case.
cat >conftest.$ac_ext <<_ACEOF
! #line 1937 "configure"
#include "confdefs.h"
#include
Syntax error
_ACEOF
! if { (eval echo "$as_me:1942: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
***************
*** 1926,1930 ****
rm -f conftest.er1
cat conftest.err >&5
! echo "$as_me:1928: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
--- 1946,1950 ----
rm -f conftest.er1
cat conftest.err >&5
! echo "$as_me:1948: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
***************
*** 1949,1957 ****
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
! #line 1951 "configure"
#include "confdefs.h"
#include
_ACEOF
! if { (eval echo "$as_me:1955: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
--- 1969,1977 ----
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
! #line 1971 "configure"
#include "confdefs.h"
#include
_ACEOF
! if { (eval echo "$as_me:1975: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
***************
*** 1959,1963 ****
rm -f conftest.er1
cat conftest.err >&5
! echo "$as_me:1961: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
--- 1979,1983 ----
rm -f conftest.er1
cat conftest.err >&5
! echo "$as_me:1981: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
***************
*** 1987,1991 ****
:
else
! { { echo "$as_me:1989: error: C preprocessor \"$CPP\" fails sanity check" >&5
echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
{ (exit 1); exit 1; }; }
--- 2007,2011 ----
:
else
! { { echo "$as_me:2009: error: C preprocessor \"$CPP\" fails sanity check" >&5
echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
{ (exit 1); exit 1; }; }
***************
*** 1998,2002 ****
ac_compiler_gnu=$ac_cv_c_compiler_gnu
! echo "$as_me:2000: checking for minix/config.h" >&5
echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6
if test "${ac_cv_header_minix_config_h+set}" = set; then
--- 2018,2022 ----
ac_compiler_gnu=$ac_cv_c_compiler_gnu
! echo "$as_me:2020: checking for minix/config.h" >&5
echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6
if test "${ac_cv_header_minix_config_h+set}" = set; then
***************
*** 2004,2012 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 2006 "configure"
#include "confdefs.h"
#include
_ACEOF
! if { (eval echo "$as_me:2010: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
--- 2024,2032 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 2026 "configure"
#include "confdefs.h"
#include
_ACEOF
! if { (eval echo "$as_me:2030: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
***************
*** 2014,2018 ****
rm -f conftest.er1
cat conftest.err >&5
! echo "$as_me:2016: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
--- 2034,2038 ----
rm -f conftest.er1
cat conftest.err >&5
! echo "$as_me:2036: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
***************
*** 2033,2037 ****
rm -f conftest.err conftest.$ac_ext
fi
! echo "$as_me:2035: result: $ac_cv_header_minix_config_h" >&5
echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6
if test $ac_cv_header_minix_config_h = yes; then
--- 2053,2057 ----
rm -f conftest.err conftest.$ac_ext
fi
! echo "$as_me:2055: result: $ac_cv_header_minix_config_h" >&5
echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6
if test $ac_cv_header_minix_config_h = yes; then
***************
*** 2061,2065 ****
if test $ac_cv_c_compiler_gnu = yes; then
! echo "$as_me:2063: checking whether $CC needs -traditional" >&5
echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
if test "${ac_cv_prog_gcc_traditional+set}" = set; then
--- 2081,2085 ----
if test $ac_cv_c_compiler_gnu = yes; then
! echo "$as_me:2083: checking whether $CC needs -traditional" >&5
echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
if test "${ac_cv_prog_gcc_traditional+set}" = set; then
***************
*** 2068,2072 ****
ac_pattern="Autoconf.*'x'"
cat >conftest.$ac_ext <<_ACEOF
! #line 2070 "configure"
#include "confdefs.h"
#include
--- 2088,2092 ----
ac_pattern="Autoconf.*'x'"
cat >conftest.$ac_ext <<_ACEOF
! #line 2090 "configure"
#include "confdefs.h"
#include
***************
*** 2083,2087 ****
if test $ac_cv_prog_gcc_traditional = no; then
cat >conftest.$ac_ext <<_ACEOF
! #line 2085 "configure"
#include "confdefs.h"
#include
--- 2103,2107 ----
if test $ac_cv_prog_gcc_traditional = no; then
cat >conftest.$ac_ext <<_ACEOF
! #line 2105 "configure"
#include "confdefs.h"
#include
***************
*** 2096,2100 ****
fi
fi
! echo "$as_me:2098: result: $ac_cv_prog_gcc_traditional" >&5
echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
if test $ac_cv_prog_gcc_traditional = yes; then
--- 2116,2120 ----
fi
fi
! echo "$as_me:2118: result: $ac_cv_prog_gcc_traditional" >&5
echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
if test $ac_cv_prog_gcc_traditional = yes; then
***************
*** 2115,2119 ****
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
! echo "$as_me:2117: checking for a BSD compatible install" >&5
echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
if test -z "$INSTALL"; then
--- 2135,2139 ----
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
! echo "$as_me:2137: checking for a BSD compatible install" >&5
echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
if test -z "$INSTALL"; then
***************
*** 2164,2168 ****
fi
fi
! echo "$as_me:2166: result: $INSTALL" >&5
echo "${ECHO_T}$INSTALL" >&6
--- 2184,2188 ----
fi
fi
! echo "$as_me:2186: result: $INSTALL" >&5
echo "${ECHO_T}$INSTALL" >&6
***************
*** 2177,2181 ****
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
! echo "$as_me:2179: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_AR+set}" = set; then
--- 2197,2201 ----
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
! echo "$as_me:2199: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_AR+set}" = set; then
***************
*** 2192,2196 ****
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_AR=""
! echo "$as_me:2194: found $ac_dir/$ac_word" >&5
break
done
--- 2212,2216 ----
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_AR=""
! echo "$as_me:2214: found $ac_dir/$ac_word" >&5
break
done
***************
*** 2201,2208 ****
AR=$ac_cv_prog_AR
if test -n "$AR"; then
! echo "$as_me:2203: result: $AR" >&5
echo "${ECHO_T}$AR" >&6
else
! echo "$as_me:2206: result: no" >&5
echo "${ECHO_T}no" >&6
fi
--- 2221,2228 ----
AR=$ac_cv_prog_AR
if test -n "$AR"; then
! echo "$as_me:2223: result: $AR" >&5
echo "${ECHO_T}$AR" >&6
else
! echo "$as_me:2226: result: no" >&5
echo "${ECHO_T}no" >&6
fi
***************
*** 2212,2216 ****
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
! echo "$as_me:2214: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_RANLIB+set}" = set; then
--- 2232,2236 ----
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
! echo "$as_me:2234: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_RANLIB+set}" = set; then
***************
*** 2227,2231 ****
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
! echo "$as_me:2229: found $ac_dir/$ac_word" >&5
break
done
--- 2247,2251 ----
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
! echo "$as_me:2249: found $ac_dir/$ac_word" >&5
break
done
***************
*** 2235,2242 ****
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
! echo "$as_me:2237: result: $RANLIB" >&5
echo "${ECHO_T}$RANLIB" >&6
else
! echo "$as_me:2240: result: no" >&5
echo "${ECHO_T}no" >&6
fi
--- 2255,2262 ----
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
! echo "$as_me:2257: result: $RANLIB" >&5
echo "${ECHO_T}$RANLIB" >&6
else
! echo "$as_me:2260: result: no" >&5
echo "${ECHO_T}no" >&6
fi
***************
*** 2247,2251 ****
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
! echo "$as_me:2249: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
--- 2267,2271 ----
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
! echo "$as_me:2269: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
***************
*** 2262,2266 ****
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_RANLIB="ranlib"
! echo "$as_me:2264: found $ac_dir/$ac_word" >&5
break
done
--- 2282,2286 ----
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_RANLIB="ranlib"
! echo "$as_me:2284: found $ac_dir/$ac_word" >&5
break
done
***************
*** 2271,2278 ****
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
! echo "$as_me:2273: result: $ac_ct_RANLIB" >&5
echo "${ECHO_T}$ac_ct_RANLIB" >&6
else
! echo "$as_me:2276: result: no" >&5
echo "${ECHO_T}no" >&6
fi
--- 2291,2298 ----
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
! echo "$as_me:2293: result: $ac_ct_RANLIB" >&5
echo "${ECHO_T}$ac_ct_RANLIB" >&6
else
! echo "$as_me:2296: result: no" >&5
echo "${ECHO_T}no" >&6
fi
***************
*** 2285,2289 ****
MAKE_SHELL=/bin/sh
! echo "$as_me:2287: checking for $CC option to accept ANSI C" >&5
echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
if test "${ac_cv_prog_cc_stdc+set}" = set; then
--- 2305,2309 ----
MAKE_SHELL=/bin/sh
! echo "$as_me:2307: checking for $CC option to accept ANSI C" >&5
echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
if test "${ac_cv_prog_cc_stdc+set}" = set; then
***************
*** 2293,2297 ****
ac_save_CC=$CC
cat >conftest.$ac_ext <<_ACEOF
! #line 2295 "configure"
#include "confdefs.h"
#include
--- 2313,2317 ----
ac_save_CC=$CC
cat >conftest.$ac_ext <<_ACEOF
! #line 2315 "configure"
#include "confdefs.h"
#include
***************
*** 2342,2355 ****
CC="$ac_save_CC $ac_arg"
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:2344: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:2347: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:2350: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:2353: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_prog_cc_stdc=$ac_arg
--- 2362,2375 ----
CC="$ac_save_CC $ac_arg"
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:2364: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:2367: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:2370: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:2373: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_prog_cc_stdc=$ac_arg
***************
*** 2368,2380 ****
case "x$ac_cv_prog_cc_stdc" in
x|xno)
! echo "$as_me:2370: result: none needed" >&5
echo "${ECHO_T}none needed" >&6 ;;
*)
! echo "$as_me:2373: result: $ac_cv_prog_cc_stdc" >&5
echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
CC="$CC $ac_cv_prog_cc_stdc" ;;
esac
! echo "$as_me:2378: checking for an ANSI C-conforming const" >&5
echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
if test "${ac_cv_c_const+set}" = set; then
--- 2388,2400 ----
case "x$ac_cv_prog_cc_stdc" in
x|xno)
! echo "$as_me:2390: result: none needed" >&5
echo "${ECHO_T}none needed" >&6 ;;
*)
! echo "$as_me:2393: result: $ac_cv_prog_cc_stdc" >&5
echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
CC="$CC $ac_cv_prog_cc_stdc" ;;
esac
! echo "$as_me:2398: checking for an ANSI C-conforming const" >&5
echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
if test "${ac_cv_c_const+set}" = set; then
***************
*** 2382,2386 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 2384 "configure"
#include "confdefs.h"
--- 2402,2406 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 2404 "configure"
#include "confdefs.h"
***************
*** 2440,2453 ****
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:2442: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:2445: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:2448: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:2451: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_c_const=yes
--- 2460,2473 ----
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:2462: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:2465: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:2468: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:2471: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_c_const=yes
***************
*** 2459,2463 ****
rm -f conftest.$ac_objext conftest.$ac_ext
fi
! echo "$as_me:2461: result: $ac_cv_c_const" >&5
echo "${ECHO_T}$ac_cv_c_const" >&6
if test $ac_cv_c_const = no; then
--- 2479,2483 ----
rm -f conftest.$ac_objext conftest.$ac_ext
fi
! echo "$as_me:2481: result: $ac_cv_c_const" >&5
echo "${ECHO_T}$ac_cv_c_const" >&6
if test $ac_cv_c_const = no; then
***************
*** 2469,2476 ****
fi
! echo "$as_me:2471: checking for function prototypes" >&5
echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6
if test "$ac_cv_prog_cc_stdc" != no; then
! echo "$as_me:2474: result: yes" >&5
echo "${ECHO_T}yes" >&6
--- 2489,2496 ----
fi
! echo "$as_me:2491: checking for function prototypes" >&5
echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6
if test "$ac_cv_prog_cc_stdc" != no; then
! echo "$as_me:2494: result: yes" >&5
echo "${ECHO_T}yes" >&6
***************
*** 2480,2542 ****
else
! echo "$as_me:2482: result: no" >&5
echo "${ECHO_T}no" >&6
fi
! echo "$as_me:2486: checking return type of signal handlers" >&5
! echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
! if test "${ac_cv_type_signal+set}" = set; then
! echo $ECHO_N "(cached) $ECHO_C" >&6
! else
! cat >conftest.$ac_ext <<_ACEOF
! #line 2492 "configure"
! #include "confdefs.h"
! #include
! #include
! #ifdef signal
! # undef signal
! #endif
! #ifdef __cplusplus
! extern "C" void (*signal (int, void (*)(int)))(int);
! #else
! void (*signal ()) ();
! #endif
!
! int
! main ()
! {
! int i;
! ;
! return 0;
! }
! _ACEOF
! rm -f conftest.$ac_objext
! if { (eval echo "$as_me:2514: \"$ac_compile\"") >&5
! (eval $ac_compile) 2>&5
! ac_status=$?
! echo "$as_me:2517: \$? = $ac_status" >&5
! (exit $ac_status); } &&
! { ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:2520: \"$ac_try\"") >&5
! (eval $ac_try) 2>&5
! ac_status=$?
! echo "$as_me:2523: \$? = $ac_status" >&5
! (exit $ac_status); }; }; then
! ac_cv_type_signal=void
! else
! echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
! ac_cv_type_signal=int
! fi
! rm -f conftest.$ac_objext conftest.$ac_ext
! fi
! echo "$as_me:2533: result: $ac_cv_type_signal" >&5
! echo "${ECHO_T}$ac_cv_type_signal" >&6
!
! cat >>confdefs.h <&5
echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
if test "${ac_cv_header_stdc+set}" = set; then
--- 2500,2508 ----
else
! echo "$as_me:2502: result: no" >&5
echo "${ECHO_T}no" >&6
fi
! echo "$as_me:2506: checking for ANSI C header files" >&5
echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
if test "${ac_cv_header_stdc+set}" = set; then
***************
*** 2544,2548 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 2546 "configure"
#include "confdefs.h"
#include
--- 2510,2514 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 2512 "configure"
#include "confdefs.h"
#include
***************
*** 2552,2556 ****
_ACEOF
! if { (eval echo "$as_me:2554: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
--- 2518,2522 ----
_ACEOF
! if { (eval echo "$as_me:2520: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
***************
*** 2558,2562 ****
rm -f conftest.er1
cat conftest.err >&5
! echo "$as_me:2560: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
--- 2524,2528 ----
rm -f conftest.er1
cat conftest.err >&5
! echo "$as_me:2526: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
***************
*** 2580,2584 ****
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat >conftest.$ac_ext <<_ACEOF
! #line 2582 "configure"
#include "confdefs.h"
#include
--- 2546,2550 ----
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat >conftest.$ac_ext <<_ACEOF
! #line 2548 "configure"
#include "confdefs.h"
#include
***************
*** 2598,2602 ****
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat >conftest.$ac_ext <<_ACEOF
! #line 2600 "configure"
#include "confdefs.h"
#include
--- 2564,2568 ----
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat >conftest.$ac_ext <<_ACEOF
! #line 2566 "configure"
#include "confdefs.h"
#include
***************
*** 2619,2623 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 2621 "configure"
#include "confdefs.h"
#include
--- 2585,2589 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 2587 "configure"
#include "confdefs.h"
#include
***************
*** 2645,2657 ****
_ACEOF
rm -f conftest$ac_exeext
! if { (eval echo "$as_me:2647: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:2650: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
! { (eval echo "$as_me:2652: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:2655: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
--- 2611,2623 ----
_ACEOF
rm -f conftest$ac_exeext
! if { (eval echo "$as_me:2613: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:2616: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
! { (eval echo "$as_me:2618: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:2621: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
***************
*** 2666,2670 ****
fi
fi
! echo "$as_me:2668: result: $ac_cv_header_stdc" >&5
echo "${ECHO_T}$ac_cv_header_stdc" >&6
if test $ac_cv_header_stdc = yes; then
--- 2632,2636 ----
fi
fi
! echo "$as_me:2634: result: $ac_cv_header_stdc" >&5
echo "${ECHO_T}$ac_cv_header_stdc" >&6
if test $ac_cv_header_stdc = yes; then
***************
*** 2682,2686 ****
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! echo "$as_me:2684: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
--- 2648,2652 ----
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! echo "$as_me:2650: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
***************
*** 2688,2692 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 2690 "configure"
#include "confdefs.h"
$ac_includes_default
--- 2654,2658 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 2656 "configure"
#include "confdefs.h"
$ac_includes_default
***************
*** 2694,2707 ****
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:2696: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:2699: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:2702: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:2705: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_Header=yes"
--- 2660,2673 ----
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:2662: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:2665: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:2668: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:2671: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_Header=yes"
***************
*** 2713,2717 ****
rm -f conftest.$ac_objext conftest.$ac_ext
fi
! echo "$as_me:2715: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
--- 2679,2683 ----
rm -f conftest.$ac_objext conftest.$ac_ext
fi
! echo "$as_me:2681: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
***************
*** 2723,2727 ****
done
! echo "$as_me:2725: checking for size_t" >&5
echo $ECHO_N "checking for size_t... $ECHO_C" >&6
if test "${ac_cv_type_size_t+set}" = set; then
--- 2689,2793 ----
done
! echo "$as_me:2691: checking whether char is unsigned" >&5
! echo $ECHO_N "checking whether char is unsigned... $ECHO_C" >&6
! if test "${ac_cv_c_char_unsigned+set}" = set; then
! echo $ECHO_N "(cached) $ECHO_C" >&6
! else
! cat >conftest.$ac_ext <<_ACEOF
! #line 2697 "configure"
! #include "confdefs.h"
! $ac_includes_default
! int
! main ()
! {
! int _array_ [1 - 2 * !(((char) -1) < 0)]
! ;
! return 0;
! }
! _ACEOF
! rm -f conftest.$ac_objext
! if { (eval echo "$as_me:2709: \"$ac_compile\"") >&5
! (eval $ac_compile) 2>&5
! ac_status=$?
! echo "$as_me:2712: \$? = $ac_status" >&5
! (exit $ac_status); } &&
! { ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:2715: \"$ac_try\"") >&5
! (eval $ac_try) 2>&5
! ac_status=$?
! echo "$as_me:2718: \$? = $ac_status" >&5
! (exit $ac_status); }; }; then
! ac_cv_c_char_unsigned=no
! else
! echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
! ac_cv_c_char_unsigned=yes
! fi
! rm -f conftest.$ac_objext conftest.$ac_ext
! fi
! echo "$as_me:2728: result: $ac_cv_c_char_unsigned" >&5
! echo "${ECHO_T}$ac_cv_c_char_unsigned" >&6
! if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
! cat >>confdefs.h <<\EOF
! #define __CHAR_UNSIGNED__ 1
! EOF
!
! fi
!
! echo "$as_me:2737: checking return type of signal handlers" >&5
! echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
! if test "${ac_cv_type_signal+set}" = set; then
! echo $ECHO_N "(cached) $ECHO_C" >&6
! else
! cat >conftest.$ac_ext <<_ACEOF
! #line 2743 "configure"
! #include "confdefs.h"
! #include
! #include
! #ifdef signal
! # undef signal
! #endif
! #ifdef __cplusplus
! extern "C" void (*signal (int, void (*)(int)))(int);
! #else
! void (*signal ()) ();
! #endif
!
! int
! main ()
! {
! int i;
! ;
! return 0;
! }
! _ACEOF
! rm -f conftest.$ac_objext
! if { (eval echo "$as_me:2765: \"$ac_compile\"") >&5
! (eval $ac_compile) 2>&5
! ac_status=$?
! echo "$as_me:2768: \$? = $ac_status" >&5
! (exit $ac_status); } &&
! { ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:2771: \"$ac_try\"") >&5
! (eval $ac_try) 2>&5
! ac_status=$?
! echo "$as_me:2774: \$? = $ac_status" >&5
! (exit $ac_status); }; }; then
! ac_cv_type_signal=void
! else
! echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
! ac_cv_type_signal=int
! fi
! rm -f conftest.$ac_objext conftest.$ac_ext
! fi
! echo "$as_me:2784: result: $ac_cv_type_signal" >&5
! echo "${ECHO_T}$ac_cv_type_signal" >&6
!
! cat >>confdefs.h <&5
echo $ECHO_N "checking for size_t... $ECHO_C" >&6
if test "${ac_cv_type_size_t+set}" = set; then
***************
*** 2729,2733 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 2731 "configure"
#include "confdefs.h"
$ac_includes_default
--- 2795,2799 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 2797 "configure"
#include "confdefs.h"
$ac_includes_default
***************
*** 2744,2757 ****
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:2746: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:2749: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:2752: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:2755: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_size_t=yes
--- 2810,2823 ----
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:2812: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:2815: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:2818: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:2821: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_size_t=yes
***************
*** 2763,2767 ****
rm -f conftest.$ac_objext conftest.$ac_ext
fi
! echo "$as_me:2765: result: $ac_cv_type_size_t" >&5
echo "${ECHO_T}$ac_cv_type_size_t" >&6
if test $ac_cv_type_size_t = yes; then
--- 2829,2833 ----
rm -f conftest.$ac_objext conftest.$ac_ext
fi
! echo "$as_me:2831: result: $ac_cv_type_size_t" >&5
echo "${ECHO_T}$ac_cv_type_size_t" >&6
if test $ac_cv_type_size_t = yes; then
***************
*** 2775,2779 ****
fi
! echo "$as_me:2777: checking for ssize_t" >&5
echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
if test "${ac_cv_type_ssize_t+set}" = set; then
--- 2841,2845 ----
fi
! echo "$as_me:2843: checking for ssize_t" >&5
echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
if test "${ac_cv_type_ssize_t+set}" = set; then
***************
*** 2781,2785 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 2783 "configure"
#include "confdefs.h"
$ac_includes_default
--- 2847,2851 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 2849 "configure"
#include "confdefs.h"
$ac_includes_default
***************
*** 2796,2809 ****
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:2798: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:2801: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:2804: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:2807: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_ssize_t=yes
--- 2862,2875 ----
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:2864: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:2867: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:2870: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:2873: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_ssize_t=yes
***************
*** 2815,2819 ****
rm -f conftest.$ac_objext conftest.$ac_ext
fi
! echo "$as_me:2817: result: $ac_cv_type_ssize_t" >&5
echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
if test $ac_cv_type_ssize_t = yes; then
--- 2881,2885 ----
rm -f conftest.$ac_objext conftest.$ac_ext
fi
! echo "$as_me:2883: result: $ac_cv_type_ssize_t" >&5
echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
if test $ac_cv_type_ssize_t = yes; then
***************
*** 2827,2831 ****
fi
! echo "$as_me:2829: checking whether stat file-mode macros are broken" >&5
echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6
if test "${ac_cv_header_stat_broken+set}" = set; then
--- 2893,2897 ----
fi
! echo "$as_me:2895: checking whether stat file-mode macros are broken" >&5
echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6
if test "${ac_cv_header_stat_broken+set}" = set; then
***************
*** 2833,2837 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 2835 "configure"
#include "confdefs.h"
#include
--- 2899,2903 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 2901 "configure"
#include "confdefs.h"
#include
***************
*** 2872,2876 ****
fi
! echo "$as_me:2874: result: $ac_cv_header_stat_broken" >&5
echo "${ECHO_T}$ac_cv_header_stat_broken" >&6
if test $ac_cv_header_stat_broken = yes; then
--- 2938,2942 ----
fi
! echo "$as_me:2940: result: $ac_cv_header_stat_broken" >&5
echo "${ECHO_T}$ac_cv_header_stat_broken" >&6
if test $ac_cv_header_stat_broken = yes; then
***************
*** 2885,2889 ****
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
! echo "$as_me:2887: checking for $ac_hdr that defines DIR" >&5
echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
--- 2951,2955 ----
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
! echo "$as_me:2953: checking for $ac_hdr that defines DIR" >&5
echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
***************
*** 2891,2895 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 2893 "configure"
#include "confdefs.h"
#include
--- 2957,2961 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 2959 "configure"
#include "confdefs.h"
#include
***************
*** 2906,2919 ****
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:2908: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:2911: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:2914: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:2917: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_Header=yes"
--- 2972,2985 ----
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:2974: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:2977: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:2980: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:2983: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_Header=yes"
***************
*** 2925,2929 ****
rm -f conftest.$ac_objext conftest.$ac_ext
fi
! echo "$as_me:2927: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
--- 2991,2995 ----
rm -f conftest.$ac_objext conftest.$ac_ext
fi
! echo "$as_me:2993: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
***************
*** 2938,2942 ****
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
! echo "$as_me:2940: checking for opendir in -ldir" >&5
echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
if test "${ac_cv_lib_dir_opendir+set}" = set; then
--- 3004,3008 ----
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
! echo "$as_me:3006: checking for opendir in -ldir" >&5
echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
if test "${ac_cv_lib_dir_opendir+set}" = set; then
***************
*** 2946,2950 ****
LIBS="-ldir $LIBS"
cat >conftest.$ac_ext <<_ACEOF
! #line 2948 "configure"
#include "confdefs.h"
--- 3012,3016 ----
LIBS="-ldir $LIBS"
cat >conftest.$ac_ext <<_ACEOF
! #line 3014 "configure"
#include "confdefs.h"
***************
*** 2965,2978 ****
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:2967: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:2970: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:2973: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:2976: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dir_opendir=yes
--- 3031,3044 ----
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:3033: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:3036: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:3039: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:3042: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dir_opendir=yes
***************
*** 2985,2989 ****
LIBS=$ac_check_lib_save_LIBS
fi
! echo "$as_me:2987: result: $ac_cv_lib_dir_opendir" >&5
echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
if test $ac_cv_lib_dir_opendir = yes; then
--- 3051,3055 ----
LIBS=$ac_check_lib_save_LIBS
fi
! echo "$as_me:3053: result: $ac_cv_lib_dir_opendir" >&5
echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
if test $ac_cv_lib_dir_opendir = yes; then
***************
*** 2992,2996 ****
else
! echo "$as_me:2994: checking for opendir in -lx" >&5
echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
if test "${ac_cv_lib_x_opendir+set}" = set; then
--- 3058,3062 ----
else
! echo "$as_me:3060: checking for opendir in -lx" >&5
echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
if test "${ac_cv_lib_x_opendir+set}" = set; then
***************
*** 3000,3004 ****
LIBS="-lx $LIBS"
cat >conftest.$ac_ext <<_ACEOF
! #line 3002 "configure"
#include "confdefs.h"
--- 3066,3070 ----
LIBS="-lx $LIBS"
cat >conftest.$ac_ext <<_ACEOF
! #line 3068 "configure"
#include "confdefs.h"
***************
*** 3019,3032 ****
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:3021: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:3024: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:3027: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:3030: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_x_opendir=yes
--- 3085,3098 ----
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:3087: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:3090: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:3093: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:3096: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_x_opendir=yes
***************
*** 3039,3043 ****
LIBS=$ac_check_lib_save_LIBS
fi
! echo "$as_me:3041: result: $ac_cv_lib_x_opendir" >&5
echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
if test $ac_cv_lib_x_opendir = yes; then
--- 3105,3109 ----
LIBS=$ac_check_lib_save_LIBS
fi
! echo "$as_me:3107: result: $ac_cv_lib_x_opendir" >&5
echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
if test $ac_cv_lib_x_opendir = yes; then
***************
*** 3051,3055 ****
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:3053: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
--- 3117,3121 ----
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:3119: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
***************
*** 3057,3061 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 3059 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
--- 3123,3127 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 3125 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
***************
*** 3088,3101 ****
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:3090: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:3093: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:3096: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:3099: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
--- 3154,3167 ----
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:3156: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:3159: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:3162: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:3165: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
***************
*** 3107,3111 ****
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
! echo "$as_me:3109: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
--- 3173,3177 ----
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
! echo "$as_me:3175: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
***************
*** 3117,3121 ****
done
! echo "$as_me:3119: checking for working strcoll" >&5
echo $ECHO_N "checking for working strcoll... $ECHO_C" >&6
if test "${ac_cv_func_strcoll_works+set}" = set; then
--- 3183,3187 ----
done
! echo "$as_me:3185: checking for working strcoll" >&5
echo $ECHO_N "checking for working strcoll... $ECHO_C" >&6
if test "${ac_cv_func_strcoll_works+set}" = set; then
***************
*** 3126,3130 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 3128 "configure"
#include "confdefs.h"
$ac_includes_default
--- 3192,3196 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 3194 "configure"
#include "confdefs.h"
$ac_includes_default
***************
*** 3140,3152 ****
_ACEOF
rm -f conftest$ac_exeext
! if { (eval echo "$as_me:3142: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:3145: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
! { (eval echo "$as_me:3147: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:3150: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_strcoll_works=yes
--- 3206,3218 ----
_ACEOF
rm -f conftest$ac_exeext
! if { (eval echo "$as_me:3208: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:3211: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
! { (eval echo "$as_me:3213: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:3216: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_strcoll_works=yes
***************
*** 3160,3164 ****
fi
fi
! echo "$as_me:3162: result: $ac_cv_func_strcoll_works" >&5
echo "${ECHO_T}$ac_cv_func_strcoll_works" >&6
if test $ac_cv_func_strcoll_works = yes; then
--- 3226,3230 ----
fi
fi
! echo "$as_me:3228: result: $ac_cv_func_strcoll_works" >&5
echo "${ECHO_T}$ac_cv_func_strcoll_works" >&6
if test $ac_cv_func_strcoll_works = yes; then
***************
*** 3175,3179 ****
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! echo "$as_me:3177: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
--- 3241,3245 ----
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! echo "$as_me:3243: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
***************
*** 3181,3189 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 3183 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
! if { (eval echo "$as_me:3187: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
--- 3247,3255 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 3249 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
! if { (eval echo "$as_me:3253: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
***************
*** 3191,3195 ****
rm -f conftest.er1
cat conftest.err >&5
! echo "$as_me:3193: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
--- 3257,3261 ----
rm -f conftest.er1
cat conftest.err >&5
! echo "$as_me:3259: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
***************
*** 3210,3214 ****
rm -f conftest.err conftest.$ac_ext
fi
! echo "$as_me:3212: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
--- 3276,3280 ----
rm -f conftest.err conftest.$ac_ext
fi
! echo "$as_me:3278: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
***************
*** 3220,3224 ****
done
! echo "$as_me:3222: checking for type of signal functions" >&5
echo $ECHO_N "checking for type of signal functions... $ECHO_C" >&6
if test "${bash_cv_signal_vintage+set}" = set; then
--- 3286,3290 ----
done
! echo "$as_me:3288: checking for type of signal functions" >&5
echo $ECHO_N "checking for type of signal functions... $ECHO_C" >&6
if test "${bash_cv_signal_vintage+set}" = set; then
***************
*** 3227,3231 ****
cat >conftest.$ac_ext <<_ACEOF
! #line 3229 "configure"
#include "confdefs.h"
#include
--- 3293,3297 ----
cat >conftest.$ac_ext <<_ACEOF
! #line 3295 "configure"
#include "confdefs.h"
#include
***************
*** 3245,3258 ****
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:3247: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:3250: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:3253: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:3256: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_signal_vintage=posix
--- 3311,3324 ----
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:3313: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:3316: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:3319: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:3322: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_signal_vintage=posix
***************
*** 3262,3266 ****
cat >conftest.$ac_ext <<_ACEOF
! #line 3264 "configure"
#include "confdefs.h"
#include
--- 3328,3332 ----
cat >conftest.$ac_ext <<_ACEOF
! #line 3330 "configure"
#include "confdefs.h"
#include
***************
*** 3277,3290 ****
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:3279: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:3282: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:3285: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:3288: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_signal_vintage=4.2bsd
--- 3343,3356 ----
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:3345: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:3348: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:3351: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:3354: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_signal_vintage=4.2bsd
***************
*** 3294,3298 ****
cat >conftest.$ac_ext <<_ACEOF
! #line 3296 "configure"
#include "confdefs.h"
--- 3360,3364 ----
cat >conftest.$ac_ext <<_ACEOF
! #line 3362 "configure"
#include "confdefs.h"
***************
*** 3312,3325 ****
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:3314: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:3317: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:3320: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:3323: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_signal_vintage=svr3
--- 3378,3391 ----
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:3380: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:3383: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:3386: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:3389: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_signal_vintage=svr3
***************
*** 3340,3344 ****
fi
! echo "$as_me:3342: result: $bash_cv_signal_vintage" >&5
echo "${ECHO_T}$bash_cv_signal_vintage" >&6
if test "$bash_cv_signal_vintage" = posix; then
--- 3406,3410 ----
fi
! echo "$as_me:3408: result: $bash_cv_signal_vintage" >&5
echo "${ECHO_T}$bash_cv_signal_vintage" >&6
if test "$bash_cv_signal_vintage" = posix; then
***************
*** 3359,3363 ****
fi
! echo "$as_me:3361: checking if signal handlers must be reinstalled when invoked" >&5
echo $ECHO_N "checking if signal handlers must be reinstalled when invoked... $ECHO_C" >&6
if test "${bash_cv_must_reinstall_sighandlers+set}" = set; then
--- 3425,3429 ----
fi
! echo "$as_me:3427: checking if signal handlers must be reinstalled when invoked" >&5
echo $ECHO_N "checking if signal handlers must be reinstalled when invoked... $ECHO_C" >&6
if test "${bash_cv_must_reinstall_sighandlers+set}" = set; then
***************
*** 3365,3369 ****
else
if test "$cross_compiling" = yes; then
! { echo "$as_me:3367: WARNING: cannot check signal handling if cross compiling -- defaulting to no" >&5
echo "$as_me: WARNING: cannot check signal handling if cross compiling -- defaulting to no" >&2;}
bash_cv_must_reinstall_sighandlers=no
--- 3431,3435 ----
else
if test "$cross_compiling" = yes; then
! { echo "$as_me:3433: WARNING: cannot check signal handling if cross compiling -- defaulting to no" >&5
echo "$as_me: WARNING: cannot check signal handling if cross compiling -- defaulting to no" >&2;}
bash_cv_must_reinstall_sighandlers=no
***************
*** 3371,3375 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 3373 "configure"
#include "confdefs.h"
--- 3437,3441 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 3439 "configure"
#include "confdefs.h"
***************
*** 3419,3431 ****
_ACEOF
rm -f conftest$ac_exeext
! if { (eval echo "$as_me:3421: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:3424: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
! { (eval echo "$as_me:3426: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:3429: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_must_reinstall_sighandlers=no
--- 3485,3497 ----
_ACEOF
rm -f conftest$ac_exeext
! if { (eval echo "$as_me:3487: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:3490: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
! { (eval echo "$as_me:3492: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:3495: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_must_reinstall_sighandlers=no
***************
*** 3440,3444 ****
fi
! echo "$as_me:3442: result: $bash_cv_must_reinstall_sighandlers" >&5
echo "${ECHO_T}$bash_cv_must_reinstall_sighandlers" >&6
if test $bash_cv_must_reinstall_sighandlers = yes; then
--- 3506,3510 ----
fi
! echo "$as_me:3508: result: $bash_cv_must_reinstall_sighandlers" >&5
echo "${ECHO_T}$bash_cv_must_reinstall_sighandlers" >&6
if test $bash_cv_must_reinstall_sighandlers = yes; then
***************
*** 3449,3453 ****
fi
! echo "$as_me:3451: checking for presence of POSIX-style sigsetjmp/siglongjmp" >&5
echo $ECHO_N "checking for presence of POSIX-style sigsetjmp/siglongjmp... $ECHO_C" >&6
if test "${bash_cv_func_sigsetjmp+set}" = set; then
--- 3515,3519 ----
fi
! echo "$as_me:3517: checking for presence of POSIX-style sigsetjmp/siglongjmp" >&5
echo $ECHO_N "checking for presence of POSIX-style sigsetjmp/siglongjmp... $ECHO_C" >&6
if test "${bash_cv_func_sigsetjmp+set}" = set; then
***************
*** 3455,3459 ****
else
if test "$cross_compiling" = yes; then
! { echo "$as_me:3457: WARNING: cannot check for sigsetjmp/siglongjmp if cross-compiling -- defaulting to missing" >&5
echo "$as_me: WARNING: cannot check for sigsetjmp/siglongjmp if cross-compiling -- defaulting to missing" >&2;}
bash_cv_func_sigsetjmp=missing
--- 3521,3525 ----
else
if test "$cross_compiling" = yes; then
! { echo "$as_me:3523: WARNING: cannot check for sigsetjmp/siglongjmp if cross-compiling -- defaulting to missing" >&5
echo "$as_me: WARNING: cannot check for sigsetjmp/siglongjmp if cross-compiling -- defaulting to missing" >&2;}
bash_cv_func_sigsetjmp=missing
***************
*** 3461,3465 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 3463 "configure"
#include "confdefs.h"
--- 3527,3531 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 3529 "configure"
#include "confdefs.h"
***************
*** 3503,3515 ****
_ACEOF
rm -f conftest$ac_exeext
! if { (eval echo "$as_me:3505: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:3508: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
! { (eval echo "$as_me:3510: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:3513: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_func_sigsetjmp=present
--- 3569,3581 ----
_ACEOF
rm -f conftest$ac_exeext
! if { (eval echo "$as_me:3571: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:3574: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
! { (eval echo "$as_me:3576: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:3579: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_func_sigsetjmp=present
***************
*** 3524,3528 ****
fi
! echo "$as_me:3526: result: $bash_cv_func_sigsetjmp" >&5
echo "${ECHO_T}$bash_cv_func_sigsetjmp" >&6
if test $bash_cv_func_sigsetjmp = present; then
--- 3590,3594 ----
fi
! echo "$as_me:3592: result: $bash_cv_func_sigsetjmp" >&5
echo "${ECHO_T}$bash_cv_func_sigsetjmp" >&6
if test $bash_cv_func_sigsetjmp = present; then
***************
*** 3533,3537 ****
fi
! echo "$as_me:3535: checking for lstat" >&5
echo $ECHO_N "checking for lstat... $ECHO_C" >&6
if test "${bash_cv_func_lstat+set}" = set; then
--- 3599,3603 ----
fi
! echo "$as_me:3601: checking for lstat" >&5
echo $ECHO_N "checking for lstat... $ECHO_C" >&6
if test "${bash_cv_func_lstat+set}" = set; then
***************
*** 3539,3543 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 3541 "configure"
#include "confdefs.h"
--- 3605,3609 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 3607 "configure"
#include "confdefs.h"
***************
*** 3554,3567 ****
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:3556: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:3559: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:3562: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:3565: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_func_lstat=yes
--- 3620,3633 ----
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:3622: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:3625: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:3628: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:3631: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_func_lstat=yes
***************
*** 3573,3577 ****
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
! echo "$as_me:3575: result: $bash_cv_func_lstat" >&5
echo "${ECHO_T}$bash_cv_func_lstat" >&6
if test $bash_cv_func_lstat = yes; then
--- 3639,3643 ----
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
! echo "$as_me:3641: result: $bash_cv_func_lstat" >&5
echo "${ECHO_T}$bash_cv_func_lstat" >&6
if test $bash_cv_func_lstat = yes; then
***************
*** 3582,3586 ****
fi
! echo "$as_me:3584: checking whether or not strcoll and strcmp differ" >&5
echo $ECHO_N "checking whether or not strcoll and strcmp differ... $ECHO_C" >&6
if test "${bash_cv_func_strcoll_broken+set}" = set; then
--- 3648,3652 ----
fi
! echo "$as_me:3650: checking whether or not strcoll and strcmp differ" >&5
echo $ECHO_N "checking whether or not strcoll and strcmp differ... $ECHO_C" >&6
if test "${bash_cv_func_strcoll_broken+set}" = set; then
***************
*** 3588,3592 ****
else
if test "$cross_compiling" = yes; then
! { echo "$as_me:3590: WARNING: cannot check strcoll if cross compiling -- defaulting to no" >&5
echo "$as_me: WARNING: cannot check strcoll if cross compiling -- defaulting to no" >&2;}
bash_cv_func_strcoll_broken=no
--- 3654,3658 ----
else
if test "$cross_compiling" = yes; then
! { echo "$as_me:3656: WARNING: cannot check strcoll if cross compiling -- defaulting to no" >&5
echo "$as_me: WARNING: cannot check strcoll if cross compiling -- defaulting to no" >&2;}
bash_cv_func_strcoll_broken=no
***************
*** 3594,3598 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 3596 "configure"
#include "confdefs.h"
--- 3660,3664 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 3662 "configure"
#include "confdefs.h"
***************
*** 3634,3646 ****
_ACEOF
rm -f conftest$ac_exeext
! if { (eval echo "$as_me:3636: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:3639: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
! { (eval echo "$as_me:3641: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:3644: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_func_strcoll_broken=yes
--- 3700,3712 ----
_ACEOF
rm -f conftest$ac_exeext
! if { (eval echo "$as_me:3702: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:3705: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
! { (eval echo "$as_me:3707: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:3710: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_func_strcoll_broken=yes
***************
*** 3655,3659 ****
fi
! echo "$as_me:3657: result: $bash_cv_func_strcoll_broken" >&5
echo "${ECHO_T}$bash_cv_func_strcoll_broken" >&6
if test $bash_cv_func_strcoll_broken = yes; then
--- 3721,3725 ----
fi
! echo "$as_me:3723: result: $bash_cv_func_strcoll_broken" >&5
echo "${ECHO_T}$bash_cv_func_strcoll_broken" >&6
if test $bash_cv_func_strcoll_broken = yes; then
***************
*** 3664,3668 ****
fi
! echo "$as_me:3666: checking whether getpw functions are declared in pwd.h" >&5
echo $ECHO_N "checking whether getpw functions are declared in pwd.h... $ECHO_C" >&6
if test "${bash_cv_getpw_declared+set}" = set; then
--- 3730,3734 ----
fi
! echo "$as_me:3732: checking whether getpw functions are declared in pwd.h" >&5
echo $ECHO_N "checking whether getpw functions are declared in pwd.h... $ECHO_C" >&6
if test "${bash_cv_getpw_declared+set}" = set; then
***************
*** 3670,3674 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 3672 "configure"
#include "confdefs.h"
--- 3736,3740 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 3738 "configure"
#include "confdefs.h"
***************
*** 3690,3694 ****
fi
! echo "$as_me:3692: result: $bash_cv_getpw_declared" >&5
echo "${ECHO_T}$bash_cv_getpw_declared" >&6
if test $bash_cv_getpw_declared = yes; then
--- 3756,3760 ----
fi
! echo "$as_me:3758: result: $bash_cv_getpw_declared" >&5
echo "${ECHO_T}$bash_cv_getpw_declared" >&6
if test $bash_cv_getpw_declared = yes; then
***************
*** 3699,3703 ****
fi
! echo "$as_me:3701: checking POSIX termios" >&5
echo $ECHO_N "checking POSIX termios... $ECHO_C" >&6
if test "${ac_cv_sys_posix_termios+set}" = set; then
--- 3765,3769 ----
fi
! echo "$as_me:3767: checking POSIX termios" >&5
echo $ECHO_N "checking POSIX termios... $ECHO_C" >&6
if test "${ac_cv_sys_posix_termios+set}" = set; then
***************
*** 3705,3709 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 3707 "configure"
#include "confdefs.h"
#include
--- 3771,3775 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 3773 "configure"
#include "confdefs.h"
#include
***************
*** 3720,3733 ****
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:3722: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:3725: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:3728: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:3731: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sys_posix_termios=yes
--- 3786,3799 ----
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:3788: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:3791: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:3794: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:3797: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sys_posix_termios=yes
***************
*** 3739,3747 ****
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
! echo "$as_me:3741: result: $ac_cv_sys_posix_termios" >&5
echo "${ECHO_T}$ac_cv_sys_posix_termios" >&6
if test $ac_cv_sys_posix_termios = yes; then
! echo "$as_me:3745: checking whether termios.h defines TIOCGWINSZ" >&5
echo $ECHO_N "checking whether termios.h defines TIOCGWINSZ... $ECHO_C" >&6
if test "${ac_cv_sys_tiocgwinsz_in_termios_h+set}" = set; then
--- 3805,3813 ----
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
! echo "$as_me:3807: result: $ac_cv_sys_posix_termios" >&5
echo "${ECHO_T}$ac_cv_sys_posix_termios" >&6
if test $ac_cv_sys_posix_termios = yes; then
! echo "$as_me:3811: checking whether termios.h defines TIOCGWINSZ" >&5
echo $ECHO_N "checking whether termios.h defines TIOCGWINSZ... $ECHO_C" >&6
if test "${ac_cv_sys_tiocgwinsz_in_termios_h+set}" = set; then
***************
*** 3749,3753 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 3751 "configure"
#include "confdefs.h"
#include
--- 3815,3819 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 3817 "configure"
#include "confdefs.h"
#include
***************
*** 3767,3776 ****
fi
! echo "$as_me:3769: result: $ac_cv_sys_tiocgwinsz_in_termios_h" >&5
echo "${ECHO_T}$ac_cv_sys_tiocgwinsz_in_termios_h" >&6
fi
if test $ac_cv_sys_tiocgwinsz_in_termios_h != yes; then
! echo "$as_me:3774: checking whether sys/ioctl.h defines TIOCGWINSZ" >&5
echo $ECHO_N "checking whether sys/ioctl.h defines TIOCGWINSZ... $ECHO_C" >&6
if test "${ac_cv_sys_tiocgwinsz_in_sys_ioctl_h+set}" = set; then
--- 3833,3842 ----
fi
! echo "$as_me:3835: result: $ac_cv_sys_tiocgwinsz_in_termios_h" >&5
echo "${ECHO_T}$ac_cv_sys_tiocgwinsz_in_termios_h" >&6
fi
if test $ac_cv_sys_tiocgwinsz_in_termios_h != yes; then
! echo "$as_me:3840: checking whether sys/ioctl.h defines TIOCGWINSZ" >&5
echo $ECHO_N "checking whether sys/ioctl.h defines TIOCGWINSZ... $ECHO_C" >&6
if test "${ac_cv_sys_tiocgwinsz_in_sys_ioctl_h+set}" = set; then
***************
*** 3778,3782 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 3780 "configure"
#include "confdefs.h"
#include
--- 3844,3848 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 3846 "configure"
#include "confdefs.h"
#include
***************
*** 3796,3800 ****
fi
! echo "$as_me:3798: result: $ac_cv_sys_tiocgwinsz_in_sys_ioctl_h" >&5
echo "${ECHO_T}$ac_cv_sys_tiocgwinsz_in_sys_ioctl_h" >&6
--- 3862,3866 ----
fi
! echo "$as_me:3864: result: $ac_cv_sys_tiocgwinsz_in_sys_ioctl_h" >&5
echo "${ECHO_T}$ac_cv_sys_tiocgwinsz_in_sys_ioctl_h" >&6
***************
*** 3808,3812 ****
fi
! echo "$as_me:3810: checking whether signal handlers are of type void" >&5
echo $ECHO_N "checking whether signal handlers are of type void... $ECHO_C" >&6
if test "${bash_cv_void_sighandler+set}" = set; then
--- 3874,3878 ----
fi
! echo "$as_me:3876: checking whether signal handlers are of type void" >&5
echo $ECHO_N "checking whether signal handlers are of type void... $ECHO_C" >&6
if test "${bash_cv_void_sighandler+set}" = set; then
***************
*** 3814,3818 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 3816 "configure"
#include "confdefs.h"
#include
--- 3880,3884 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 3882 "configure"
#include "confdefs.h"
#include
***************
*** 3834,3847 ****
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:3836: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:3839: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:3842: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:3845: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_void_sighandler=yes
--- 3900,3913 ----
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:3902: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:3905: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:3908: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:3911: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_void_sighandler=yes
***************
*** 3853,3857 ****
rm -f conftest.$ac_objext conftest.$ac_ext
fi
! echo "$as_me:3855: result: $bash_cv_void_sighandler" >&5
echo "${ECHO_T}$bash_cv_void_sighandler" >&6
if test $bash_cv_void_sighandler = yes; then
--- 3919,3923 ----
rm -f conftest.$ac_objext conftest.$ac_ext
fi
! echo "$as_me:3921: result: $bash_cv_void_sighandler" >&5
echo "${ECHO_T}$bash_cv_void_sighandler" >&6
if test $bash_cv_void_sighandler = yes; then
***************
*** 3862,3866 ****
fi
! echo "$as_me:3864: checking for TIOCSTAT in sys/ioctl.h" >&5
echo $ECHO_N "checking for TIOCSTAT in sys/ioctl.h... $ECHO_C" >&6
if test "${bash_cv_tiocstat_in_ioctl+set}" = set; then
--- 3928,3932 ----
fi
! echo "$as_me:3930: checking for TIOCSTAT in sys/ioctl.h" >&5
echo $ECHO_N "checking for TIOCSTAT in sys/ioctl.h... $ECHO_C" >&6
if test "${bash_cv_tiocstat_in_ioctl+set}" = set; then
***************
*** 3868,3872 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 3870 "configure"
#include "confdefs.h"
#include
--- 3934,3938 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 3936 "configure"
#include "confdefs.h"
#include
***************
*** 3881,3894 ****
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:3883: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:3886: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:3889: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:3892: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_tiocstat_in_ioctl=yes
--- 3947,3960 ----
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:3949: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:3952: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:3955: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:3958: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_tiocstat_in_ioctl=yes
***************
*** 3901,3905 ****
fi
! echo "$as_me:3903: result: $bash_cv_tiocstat_in_ioctl" >&5
echo "${ECHO_T}$bash_cv_tiocstat_in_ioctl" >&6
if test $bash_cv_tiocstat_in_ioctl = yes; then
--- 3967,3971 ----
fi
! echo "$as_me:3969: result: $bash_cv_tiocstat_in_ioctl" >&5
echo "${ECHO_T}$bash_cv_tiocstat_in_ioctl" >&6
if test $bash_cv_tiocstat_in_ioctl = yes; then
***************
*** 3910,3914 ****
fi
! echo "$as_me:3912: checking for FIONREAD in sys/ioctl.h" >&5
echo $ECHO_N "checking for FIONREAD in sys/ioctl.h... $ECHO_C" >&6
if test "${bash_cv_fionread_in_ioctl+set}" = set; then
--- 3976,3980 ----
fi
! echo "$as_me:3978: checking for FIONREAD in sys/ioctl.h" >&5
echo $ECHO_N "checking for FIONREAD in sys/ioctl.h... $ECHO_C" >&6
if test "${bash_cv_fionread_in_ioctl+set}" = set; then
***************
*** 3916,3920 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 3918 "configure"
#include "confdefs.h"
#include
--- 3982,3986 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 3984 "configure"
#include "confdefs.h"
#include
***************
*** 3929,3942 ****
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:3931: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:3934: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:3937: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:3940: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_fionread_in_ioctl=yes
--- 3995,4008 ----
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:3997: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:4000: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:4003: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:4006: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_fionread_in_ioctl=yes
***************
*** 3949,3953 ****
fi
! echo "$as_me:3951: result: $bash_cv_fionread_in_ioctl" >&5
echo "${ECHO_T}$bash_cv_fionread_in_ioctl" >&6
if test $bash_cv_fionread_in_ioctl = yes; then
--- 4015,4019 ----
fi
! echo "$as_me:4017: result: $bash_cv_fionread_in_ioctl" >&5
echo "${ECHO_T}$bash_cv_fionread_in_ioctl" >&6
if test $bash_cv_fionread_in_ioctl = yes; then
***************
*** 3958,3962 ****
fi
! echo "$as_me:3960: checking for speed_t in sys/types.h" >&5
echo $ECHO_N "checking for speed_t in sys/types.h... $ECHO_C" >&6
if test "${bash_cv_speed_t_in_sys_types+set}" = set; then
--- 4024,4028 ----
fi
! echo "$as_me:4026: checking for speed_t in sys/types.h" >&5
echo $ECHO_N "checking for speed_t in sys/types.h... $ECHO_C" >&6
if test "${bash_cv_speed_t_in_sys_types+set}" = set; then
***************
*** 3964,3968 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 3966 "configure"
#include "confdefs.h"
#include
--- 4030,4034 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 4032 "configure"
#include "confdefs.h"
#include
***************
*** 3976,3989 ****
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:3978: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:3981: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:3984: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:3987: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_speed_t_in_sys_types=yes
--- 4042,4055 ----
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:4044: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:4047: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:4050: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:4053: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_speed_t_in_sys_types=yes
***************
*** 3996,4000 ****
fi
! echo "$as_me:3998: result: $bash_cv_speed_t_in_sys_types" >&5
echo "${ECHO_T}$bash_cv_speed_t_in_sys_types" >&6
if test $bash_cv_speed_t_in_sys_types = yes; then
--- 4062,4066 ----
fi
! echo "$as_me:4064: result: $bash_cv_speed_t_in_sys_types" >&5
echo "${ECHO_T}$bash_cv_speed_t_in_sys_types" >&6
if test $bash_cv_speed_t_in_sys_types = yes; then
***************
*** 4005,4009 ****
fi
! echo "$as_me:4007: checking for struct winsize in sys/ioctl.h and termios.h" >&5
echo $ECHO_N "checking for struct winsize in sys/ioctl.h and termios.h... $ECHO_C" >&6
if test "${bash_cv_struct_winsize_header+set}" = set; then
--- 4071,4075 ----
fi
! echo "$as_me:4073: checking for struct winsize in sys/ioctl.h and termios.h" >&5
echo $ECHO_N "checking for struct winsize in sys/ioctl.h and termios.h... $ECHO_C" >&6
if test "${bash_cv_struct_winsize_header+set}" = set; then
***************
*** 4011,4015 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 4013 "configure"
#include "confdefs.h"
#include
--- 4077,4081 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 4079 "configure"
#include "confdefs.h"
#include
***************
*** 4024,4037 ****
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:4026: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:4029: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:4032: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:4035: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_struct_winsize_header=ioctl_h
--- 4090,4103 ----
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:4092: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:4095: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:4098: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:4101: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_struct_winsize_header=ioctl_h
***************
*** 4040,4044 ****
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
! #line 4042 "configure"
#include "confdefs.h"
#include
--- 4106,4110 ----
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
! #line 4108 "configure"
#include "confdefs.h"
#include
***************
*** 4053,4066 ****
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:4055: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:4058: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:4061: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:4064: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_struct_winsize_header=termios_h
--- 4119,4132 ----
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:4121: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:4124: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:4127: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:4130: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_struct_winsize_header=termios_h
***************
*** 4077,4081 ****
if test $bash_cv_struct_winsize_header = ioctl_h; then
! echo "$as_me:4079: result: sys/ioctl.h" >&5
echo "${ECHO_T}sys/ioctl.h" >&6
cat >>confdefs.h <<\EOF
--- 4143,4147 ----
if test $bash_cv_struct_winsize_header = ioctl_h; then
! echo "$as_me:4145: result: sys/ioctl.h" >&5
echo "${ECHO_T}sys/ioctl.h" >&6
cat >>confdefs.h <<\EOF
***************
*** 4084,4088 ****
elif test $bash_cv_struct_winsize_header = termios_h; then
! echo "$as_me:4086: result: termios.h" >&5
echo "${ECHO_T}termios.h" >&6
cat >>confdefs.h <<\EOF
--- 4150,4154 ----
elif test $bash_cv_struct_winsize_header = termios_h; then
! echo "$as_me:4152: result: termios.h" >&5
echo "${ECHO_T}termios.h" >&6
cat >>confdefs.h <<\EOF
***************
*** 4091,4099 ****
else
! echo "$as_me:4093: result: not found" >&5
echo "${ECHO_T}not found" >&6
fi
! echo "$as_me:4097: checking if struct dirent has a d_ino member" >&5
echo $ECHO_N "checking if struct dirent has a d_ino member... $ECHO_C" >&6
if test "${bash_cv_dirent_has_dino+set}" = set; then
--- 4157,4165 ----
else
! echo "$as_me:4159: result: not found" >&5
echo "${ECHO_T}not found" >&6
fi
! echo "$as_me:4163: checking if struct dirent has a d_ino member" >&5
echo $ECHO_N "checking if struct dirent has a d_ino member... $ECHO_C" >&6
if test "${bash_cv_dirent_has_dino+set}" = set; then
***************
*** 4101,4105 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 4103 "configure"
#include "confdefs.h"
--- 4167,4171 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 4169 "configure"
#include "confdefs.h"
***************
*** 4135,4148 ****
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:4137: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:4140: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:4143: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:4146: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_dirent_has_dino=yes
--- 4201,4214 ----
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:4203: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:4206: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:4209: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:4212: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_dirent_has_dino=yes
***************
*** 4155,4159 ****
fi
! echo "$as_me:4157: result: $bash_cv_dirent_has_dino" >&5
echo "${ECHO_T}$bash_cv_dirent_has_dino" >&6
if test $bash_cv_dirent_has_dino = yes; then
--- 4221,4225 ----
fi
! echo "$as_me:4223: result: $bash_cv_dirent_has_dino" >&5
echo "${ECHO_T}$bash_cv_dirent_has_dino" >&6
if test $bash_cv_dirent_has_dino = yes; then
***************
*** 4164,4168 ****
fi
! echo "$as_me:4166: checking if struct dirent has a d_fileno member" >&5
echo $ECHO_N "checking if struct dirent has a d_fileno member... $ECHO_C" >&6
if test "${bash_cv_dirent_has_d_fileno+set}" = set; then
--- 4230,4234 ----
fi
! echo "$as_me:4232: checking if struct dirent has a d_fileno member" >&5
echo $ECHO_N "checking if struct dirent has a d_fileno member... $ECHO_C" >&6
if test "${bash_cv_dirent_has_d_fileno+set}" = set; then
***************
*** 4170,4174 ****
else
cat >conftest.$ac_ext <<_ACEOF
! #line 4172 "configure"
#include "confdefs.h"
--- 4236,4240 ----
else
cat >conftest.$ac_ext <<_ACEOF
! #line 4238 "configure"
#include "confdefs.h"
***************
*** 4204,4217 ****
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:4206: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:4209: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:4212: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:4215: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_dirent_has_d_fileno=yes
--- 4270,4283 ----
_ACEOF
rm -f conftest.$ac_objext
! if { (eval echo "$as_me:4272: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
! echo "$as_me:4275: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
! { (eval echo "$as_me:4278: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:4281: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
bash_cv_dirent_has_d_fileno=yes
***************
*** 4224,4228 ****
fi
! echo "$as_me:4226: result: $bash_cv_dirent_has_d_fileno" >&5
echo "${ECHO_T}$bash_cv_dirent_has_d_fileno" >&6
if test $bash_cv_dirent_has_d_fileno = yes; then
--- 4290,4294 ----
fi
! echo "$as_me:4292: result: $bash_cv_dirent_has_d_fileno" >&5
echo "${ECHO_T}$bash_cv_dirent_has_d_fileno" >&6
if test $bash_cv_dirent_has_d_fileno = yes; then
***************
*** 4240,4244 ****
_bash_needmsg=yes
else
! echo "$as_me:4242: checking which library has the termcap functions" >&5
echo $ECHO_N "checking which library has the termcap functions... $ECHO_C" >&6
_bash_needmsg=
--- 4306,4310 ----
_bash_needmsg=yes
else
! echo "$as_me:4308: checking which library has the termcap functions" >&5
echo $ECHO_N "checking which library has the termcap functions... $ECHO_C" >&6
_bash_needmsg=
***************
*** 4247,4251 ****
echo $ECHO_N "(cached) $ECHO_C" >&6
else
! echo "$as_me:4249: checking for tgetent in -ltermcap" >&5
echo $ECHO_N "checking for tgetent in -ltermcap... $ECHO_C" >&6
if test "${ac_cv_lib_termcap_tgetent+set}" = set; then
--- 4313,4317 ----
echo $ECHO_N "(cached) $ECHO_C" >&6
else
! echo "$as_me:4315: checking for tgetent in -ltermcap" >&5
echo $ECHO_N "checking for tgetent in -ltermcap... $ECHO_C" >&6
if test "${ac_cv_lib_termcap_tgetent+set}" = set; then
***************
*** 4255,4259 ****
LIBS="-ltermcap $LIBS"
cat >conftest.$ac_ext <<_ACEOF
! #line 4257 "configure"
#include "confdefs.h"
--- 4321,4325 ----
LIBS="-ltermcap $LIBS"
cat >conftest.$ac_ext <<_ACEOF
! #line 4323 "configure"
#include "confdefs.h"
***************
*** 4274,4287 ****
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:4276: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:4279: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:4282: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:4285: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_termcap_tgetent=yes
--- 4340,4353 ----
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:4342: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:4345: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:4348: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:4351: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_termcap_tgetent=yes
***************
*** 4294,4303 ****
LIBS=$ac_check_lib_save_LIBS
fi
! echo "$as_me:4296: result: $ac_cv_lib_termcap_tgetent" >&5
echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6
if test $ac_cv_lib_termcap_tgetent = yes; then
bash_cv_termcap_lib=libtermcap
else
! echo "$as_me:4301: checking for tgetent in -ltinfo" >&5
echo $ECHO_N "checking for tgetent in -ltinfo... $ECHO_C" >&6
if test "${ac_cv_lib_tinfo_tgetent+set}" = set; then
--- 4360,4369 ----
LIBS=$ac_check_lib_save_LIBS
fi
! echo "$as_me:4362: result: $ac_cv_lib_termcap_tgetent" >&5
echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6
if test $ac_cv_lib_termcap_tgetent = yes; then
bash_cv_termcap_lib=libtermcap
else
! echo "$as_me:4367: checking for tgetent in -ltinfo" >&5
echo $ECHO_N "checking for tgetent in -ltinfo... $ECHO_C" >&6
if test "${ac_cv_lib_tinfo_tgetent+set}" = set; then
***************
*** 4307,4311 ****
LIBS="-ltinfo $LIBS"
cat >conftest.$ac_ext <<_ACEOF
! #line 4309 "configure"
#include "confdefs.h"
--- 4373,4377 ----
LIBS="-ltinfo $LIBS"
cat >conftest.$ac_ext <<_ACEOF
! #line 4375 "configure"
#include "confdefs.h"
***************
*** 4326,4339 ****
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:4328: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:4331: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:4334: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:4337: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_tinfo_tgetent=yes
--- 4392,4405 ----
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:4394: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:4397: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:4400: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:4403: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_tinfo_tgetent=yes
***************
*** 4346,4355 ****
LIBS=$ac_check_lib_save_LIBS
fi
! echo "$as_me:4348: result: $ac_cv_lib_tinfo_tgetent" >&5
echo "${ECHO_T}$ac_cv_lib_tinfo_tgetent" >&6
if test $ac_cv_lib_tinfo_tgetent = yes; then
! bash_cv_termcal_lib=libtinfo
else
! echo "$as_me:4353: checking for tgetent in -lcurses" >&5
echo $ECHO_N "checking for tgetent in -lcurses... $ECHO_C" >&6
if test "${ac_cv_lib_curses_tgetent+set}" = set; then
--- 4412,4421 ----
LIBS=$ac_check_lib_save_LIBS
fi
! echo "$as_me:4414: result: $ac_cv_lib_tinfo_tgetent" >&5
echo "${ECHO_T}$ac_cv_lib_tinfo_tgetent" >&6
if test $ac_cv_lib_tinfo_tgetent = yes; then
! bash_cv_termcap_lib=libtinfo
else
! echo "$as_me:4419: checking for tgetent in -lcurses" >&5
echo $ECHO_N "checking for tgetent in -lcurses... $ECHO_C" >&6
if test "${ac_cv_lib_curses_tgetent+set}" = set; then
***************
*** 4359,4363 ****
LIBS="-lcurses $LIBS"
cat >conftest.$ac_ext <<_ACEOF
! #line 4361 "configure"
#include "confdefs.h"
--- 4425,4429 ----
LIBS="-lcurses $LIBS"
cat >conftest.$ac_ext <<_ACEOF
! #line 4427 "configure"
#include "confdefs.h"
***************
*** 4378,4391 ****
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:4380: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:4383: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:4386: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:4389: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_curses_tgetent=yes
--- 4444,4457 ----
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:4446: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:4449: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:4452: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:4455: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_curses_tgetent=yes
***************
*** 4398,4407 ****
LIBS=$ac_check_lib_save_LIBS
fi
! echo "$as_me:4400: result: $ac_cv_lib_curses_tgetent" >&5
echo "${ECHO_T}$ac_cv_lib_curses_tgetent" >&6
if test $ac_cv_lib_curses_tgetent = yes; then
bash_cv_termcap_lib=libcurses
else
! echo "$as_me:4405: checking for tgetent in -lncurses" >&5
echo $ECHO_N "checking for tgetent in -lncurses... $ECHO_C" >&6
if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then
--- 4464,4473 ----
LIBS=$ac_check_lib_save_LIBS
fi
! echo "$as_me:4466: result: $ac_cv_lib_curses_tgetent" >&5
echo "${ECHO_T}$ac_cv_lib_curses_tgetent" >&6
if test $ac_cv_lib_curses_tgetent = yes; then
bash_cv_termcap_lib=libcurses
else
! echo "$as_me:4471: checking for tgetent in -lncurses" >&5
echo $ECHO_N "checking for tgetent in -lncurses... $ECHO_C" >&6
if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then
***************
*** 4411,4415 ****
LIBS="-lncurses $LIBS"
cat >conftest.$ac_ext <<_ACEOF
! #line 4413 "configure"
#include "confdefs.h"
--- 4477,4481 ----
LIBS="-lncurses $LIBS"
cat >conftest.$ac_ext <<_ACEOF
! #line 4479 "configure"
#include "confdefs.h"
***************
*** 4430,4443 ****
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:4432: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:4435: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:4438: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:4441: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_ncurses_tgetent=yes
--- 4496,4509 ----
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:4498: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
! echo "$as_me:4501: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:4504: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
! echo "$as_me:4507: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_ncurses_tgetent=yes
***************
*** 4450,4454 ****
LIBS=$ac_check_lib_save_LIBS
fi
! echo "$as_me:4452: result: $ac_cv_lib_ncurses_tgetent" >&5
echo "${ECHO_T}$ac_cv_lib_ncurses_tgetent" >&6
if test $ac_cv_lib_ncurses_tgetent = yes; then
--- 4516,4520 ----
LIBS=$ac_check_lib_save_LIBS
fi
! echo "$as_me:4518: result: $ac_cv_lib_ncurses_tgetent" >&5
echo "${ECHO_T}$ac_cv_lib_ncurses_tgetent" >&6
if test $ac_cv_lib_ncurses_tgetent = yes; then
***************
*** 4467,4474 ****
if test "X$_bash_needmsg" = "Xyes"; then
! echo "$as_me:4469: checking which library has the termcap functions" >&5
echo $ECHO_N "checking which library has the termcap functions... $ECHO_C" >&6
fi
! echo "$as_me:4472: result: using $bash_cv_termcap_lib" >&5
echo "${ECHO_T}using $bash_cv_termcap_lib" >&6
if test $bash_cv_termcap_lib = gnutermcap && test -z "$prefer_curses"; then
--- 4533,4540 ----
if test "X$_bash_needmsg" = "Xyes"; then
! echo "$as_me:4535: checking which library has the termcap functions" >&5
echo $ECHO_N "checking which library has the termcap functions... $ECHO_C" >&6
fi
! echo "$as_me:4538: result: using $bash_cv_termcap_lib" >&5
echo "${ECHO_T}using $bash_cv_termcap_lib" >&6
if test $bash_cv_termcap_lib = gnutermcap && test -z "$prefer_curses"; then
***************
*** 4491,4495 ****
if test "$TERMCAP_LIB" = "./lib/termcap/libtermcap.a"; then
! TERMCAP_LIB=-ltermcap #default
fi
--- 4557,4937 ----
if test "$TERMCAP_LIB" = "./lib/termcap/libtermcap.a"; then
! if test "$prefer_curses" = yes; then
! TERMCAP_LIB=-lcurses
! else
! TERMCAP_LIB=-ltermcap #default
! fi
! fi
!
! for ac_header in wctype.h
! do
! as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! echo "$as_me:4569: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
! echo $ECHO_N "(cached) $ECHO_C" >&6
! else
! cat >conftest.$ac_ext <<_ACEOF
! #line 4575 "configure"
! #include "confdefs.h"
! #include <$ac_header>
! _ACEOF
! if { (eval echo "$as_me:4579: \"$ac_cpp conftest.$ac_ext\"") >&5
! (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
! ac_status=$?
! egrep -v '^ *\+' conftest.er1 >conftest.err
! rm -f conftest.er1
! cat conftest.err >&5
! echo "$as_me:4585: \$? = $ac_status" >&5
! (exit $ac_status); } >/dev/null; then
! if test -s conftest.err; then
! ac_cpp_err=$ac_c_preproc_warn_flag
! else
! ac_cpp_err=
! fi
! else
! ac_cpp_err=yes
! fi
! if test -z "$ac_cpp_err"; then
! eval "$as_ac_Header=yes"
! else
! echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
! eval "$as_ac_Header=no"
! fi
! rm -f conftest.err conftest.$ac_ext
! fi
! echo "$as_me:4604: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
! if test `eval echo '${'$as_ac_Header'}'` = yes; then
! cat >>confdefs.h <&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
! echo $ECHO_N "(cached) $ECHO_C" >&6
! else
! cat >conftest.$ac_ext <<_ACEOF
! #line 4623 "configure"
! #include "confdefs.h"
! #include <$ac_header>
! _ACEOF
! if { (eval echo "$as_me:4627: \"$ac_cpp conftest.$ac_ext\"") >&5
! (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
! ac_status=$?
! egrep -v '^ *\+' conftest.er1 >conftest.err
! rm -f conftest.er1
! cat conftest.err >&5
! echo "$as_me:4633: \$? = $ac_status" >&5
! (exit $ac_status); } >/dev/null; then
! if test -s conftest.err; then
! ac_cpp_err=$ac_c_preproc_warn_flag
! else
! ac_cpp_err=
! fi
! else
! ac_cpp_err=yes
! fi
! if test -z "$ac_cpp_err"; then
! eval "$as_ac_Header=yes"
! else
! echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
! eval "$as_ac_Header=no"
! fi
! rm -f conftest.err conftest.$ac_ext
! fi
! echo "$as_me:4652: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
! if test `eval echo '${'$as_ac_Header'}'` = yes; then
! cat >>confdefs.h <&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
! echo $ECHO_N "(cached) $ECHO_C" >&6
! else
! cat >conftest.$ac_ext <<_ACEOF
! #line 4671 "configure"
! #include "confdefs.h"
! #include <$ac_header>
! _ACEOF
! if { (eval echo "$as_me:4675: \"$ac_cpp conftest.$ac_ext\"") >&5
! (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
! ac_status=$?
! egrep -v '^ *\+' conftest.er1 >conftest.err
! rm -f conftest.er1
! cat conftest.err >&5
! echo "$as_me:4681: \$? = $ac_status" >&5
! (exit $ac_status); } >/dev/null; then
! if test -s conftest.err; then
! ac_cpp_err=$ac_c_preproc_warn_flag
! else
! ac_cpp_err=
! fi
! else
! ac_cpp_err=yes
! fi
! if test -z "$ac_cpp_err"; then
! eval "$as_ac_Header=yes"
! else
! echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
! eval "$as_ac_Header=no"
! fi
! rm -f conftest.err conftest.$ac_ext
! fi
! echo "$as_me:4700: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
! if test `eval echo '${'$as_ac_Header'}'` = yes; then
! cat >>confdefs.h <&5
! echo $ECHO_N "checking for mbsrtowcs... $ECHO_C" >&6
! if test "${ac_cv_func_mbsrtowcs+set}" = set; then
! echo $ECHO_N "(cached) $ECHO_C" >&6
! else
! cat >conftest.$ac_ext <<_ACEOF
! #line 4716 "configure"
! #include "confdefs.h"
! /* System header to define __stub macros and hopefully few prototypes,
! which can conflict with char mbsrtowcs (); below. */
! #include
! /* Override any gcc2 internal prototype to avoid an error. */
! #ifdef __cplusplus
! extern "C"
! #endif
! /* We use char because int might match the return type of a gcc2
! builtin and then its argument prototype would still apply. */
! char mbsrtowcs ();
! char (*f) ();
!
! int
! main ()
! {
! /* The GNU C library defines this for functions which it implements
! to always fail with ENOSYS. Some functions are actually named
! something starting with __ and the normal name is an alias. */
! #if defined (__stub_mbsrtowcs) || defined (__stub___mbsrtowcs)
! choke me
! #else
! f = mbsrtowcs;
! #endif
!
! ;
! return 0;
! }
! _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:4747: \"$ac_link\"") >&5
! (eval $ac_link) 2>&5
! ac_status=$?
! echo "$as_me:4750: \$? = $ac_status" >&5
! (exit $ac_status); } &&
! { ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:4753: \"$ac_try\"") >&5
! (eval $ac_try) 2>&5
! ac_status=$?
! echo "$as_me:4756: \$? = $ac_status" >&5
! (exit $ac_status); }; }; then
! ac_cv_func_mbsrtowcs=yes
! else
! echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
! ac_cv_func_mbsrtowcs=no
! fi
! rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
! fi
! echo "$as_me:4766: result: $ac_cv_func_mbsrtowcs" >&5
! echo "${ECHO_T}$ac_cv_func_mbsrtowcs" >&6
! if test $ac_cv_func_mbsrtowcs = yes; then
! cat >>confdefs.h <<\EOF
! #define HAVE_MBSRTOWCS 1
! EOF
!
! fi
!
! echo "$as_me:4775: checking for wcwidth" >&5
! echo $ECHO_N "checking for wcwidth... $ECHO_C" >&6
! if test "${ac_cv_func_wcwidth+set}" = set; then
! echo $ECHO_N "(cached) $ECHO_C" >&6
! else
! cat >conftest.$ac_ext <<_ACEOF
! #line 4781 "configure"
! #include "confdefs.h"
! /* System header to define __stub macros and hopefully few prototypes,
! which can conflict with char wcwidth (); below. */
! #include
! /* Override any gcc2 internal prototype to avoid an error. */
! #ifdef __cplusplus
! extern "C"
! #endif
! /* We use char because int might match the return type of a gcc2
! builtin and then its argument prototype would still apply. */
! char wcwidth ();
! char (*f) ();
!
! int
! main ()
! {
! /* The GNU C library defines this for functions which it implements
! to always fail with ENOSYS. Some functions are actually named
! something starting with __ and the normal name is an alias. */
! #if defined (__stub_wcwidth) || defined (__stub___wcwidth)
! choke me
! #else
! f = wcwidth;
! #endif
!
! ;
! return 0;
! }
! _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:4812: \"$ac_link\"") >&5
! (eval $ac_link) 2>&5
! ac_status=$?
! echo "$as_me:4815: \$? = $ac_status" >&5
! (exit $ac_status); } &&
! { ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:4818: \"$ac_try\"") >&5
! (eval $ac_try) 2>&5
! ac_status=$?
! echo "$as_me:4821: \$? = $ac_status" >&5
! (exit $ac_status); }; }; then
! ac_cv_func_wcwidth=yes
! else
! echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
! ac_cv_func_wcwidth=no
! fi
! rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
! fi
! echo "$as_me:4831: result: $ac_cv_func_wcwidth" >&5
! echo "${ECHO_T}$ac_cv_func_wcwidth" >&6
! if test $ac_cv_func_wcwidth = yes; then
! cat >>confdefs.h <<\EOF
! #define HAVE_WCWIDTH 1
! EOF
!
! fi
!
! echo "$as_me:4840: checking for mbstate_t" >&5
! echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6
! if test "${bash_cv_have_mbstate_t+set}" = set; then
! echo $ECHO_N "(cached) $ECHO_C" >&6
! else
! if test "$cross_compiling" = yes; then
! { { echo "$as_me:4846: error: cannot run test program while cross compiling" >&5
! echo "$as_me: error: cannot run test program while cross compiling" >&2;}
! { (exit 1); exit 1; }; }
! else
! cat >conftest.$ac_ext <<_ACEOF
! #line 4851 "configure"
! #include "confdefs.h"
!
! #include
! int
! main ()
! {
! mbstate_t ps;
! return 0;
! }
! _ACEOF
! rm -f conftest$ac_exeext
! if { (eval echo "$as_me:4863: \"$ac_link\"") >&5
! (eval $ac_link) 2>&5
! ac_status=$?
! echo "$as_me:4866: \$? = $ac_status" >&5
! (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
! { (eval echo "$as_me:4868: \"$ac_try\"") >&5
! (eval $ac_try) 2>&5
! ac_status=$?
! echo "$as_me:4871: \$? = $ac_status" >&5
! (exit $ac_status); }; }; then
! bash_cv_have_mbstate_t=yes
! else
! echo "$as_me: program exited with status $ac_status" >&5
! echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
! bash_cv_have_mbstate_t=no
! fi
! rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
! fi
! fi
! echo "$as_me:4883: result: $bash_cv_have_mbstate_t" >&5
! echo "${ECHO_T}$bash_cv_have_mbstate_t" >&6
! if test $bash_cv_have_mbstate_t = yes; then
! cat >>confdefs.h <<\EOF
! #define HAVE_MBSTATE_T 1
! EOF
!
! fi
!
! echo "$as_me:4892: checking for nl_langinfo and CODESET" >&5
! echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
! if test "${bash_cv_langinfo_codeset+set}" = set; then
! echo $ECHO_N "(cached) $ECHO_C" >&6
! else
! cat >conftest.$ac_ext <<_ACEOF
! #line 4898 "configure"
! #include "confdefs.h"
! #include
! int
! main ()
! {
! char* cs = nl_langinfo(CODESET);
! ;
! return 0;
! }
! _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:4910: \"$ac_link\"") >&5
! (eval $ac_link) 2>&5
! ac_status=$?
! echo "$as_me:4913: \$? = $ac_status" >&5
! (exit $ac_status); } &&
! { ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:4916: \"$ac_try\"") >&5
! (eval $ac_try) 2>&5
! ac_status=$?
! echo "$as_me:4919: \$? = $ac_status" >&5
! (exit $ac_status); }; }; then
! bash_cv_langinfo_codeset=yes
! else
! echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
! bash_cv_langinfo_codeset=no
! fi
! rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
! fi
! echo "$as_me:4929: result: $bash_cv_langinfo_codeset" >&5
! echo "${ECHO_T}$bash_cv_langinfo_codeset" >&6
! if test $bash_cv_langinfo_codeset = yes; then
! cat >>confdefs.h <<\EOF
! #define HAVE_LANGINFO_CODESET 1
! EOF
!
fi
***************
*** 4509,4519 ****
#
if test -f ${srcdir}/support/shobj-conf; then
! echo "$as_me:4511: checking configuration for building shared libraries" >&5
echo $ECHO_N "checking configuration for building shared libraries... $ECHO_C" >&6
eval `${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}`
! echo "$as_me:4515: result: $SHLIB_STATUS" >&5
echo "${ECHO_T}$SHLIB_STATUS" >&6
# shared library versioning
# quoted for m4 so I can use character classes
--- 4951,4967 ----
#
if test -f ${srcdir}/support/shobj-conf; then
! echo "$as_me:4953: checking configuration for building shared libraries" >&5
echo $ECHO_N "checking configuration for building shared libraries... $ECHO_C" >&6
eval `${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}`
! echo "$as_me:4957: result: $SHLIB_STATUS" >&5
echo "${ECHO_T}$SHLIB_STATUS" >&6
+ # SHLIB_STATUS is either `supported' or `unsupported'. If it's
+ # `unsupported', turn off any default shared library building
+ if test "$SHLIB_STATUS" = 'unsupported'; then
+ opt_shared_libs=no
+ fi
+
# shared library versioning
# quoted for m4 so I can use character classes
***************
*** 4523,4526 ****
--- 4971,4983 ----
fi
+ if test "$opt_static_libs" = "yes"; then
+ STATIC_TARGET=static
+ STATIC_INSTALL_TARGET=install-static
+ fi
+ if test "$opt_shared_libs" = "yes"; then
+ SHARED_TARGET=shared
+ SHARED_INSTALL_TARGET=install-shared
+ fi
+
case "$host_os" in
msdosdjgpp*) BUILD_DIR=`pwd.exe` ;; # to prevent //d/path/file
***************
*** 4609,4613 ****
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
! { echo "$as_me:4611: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF
--- 5066,5070 ----
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
! { echo "$as_me:5068: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF
***************
*** 4740,4744 ****
cat >>$CONFIG_STATUS <>$CONFIG_STATUS <&5
echo "$as_me: error: ambiguous option: $1
--- 5242,5246 ----
--he | --h)
# Conflict between --help and --header
! { { echo "$as_me:5244: error: ambiguous option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: ambiguous option: $1
***************
*** 4804,4808 ****
# This is an error.
! -*) { { echo "$as_me:4806: error: unrecognized option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: unrecognized option: $1
--- 5261,5265 ----
# This is an error.
! -*) { { echo "$as_me:5263: error: unrecognized option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: unrecognized option: $1
***************
*** 4823,4827 ****
## ----------------------- ##
! This file was extended by $as_me (readline 4.2a) 2.52, executed with
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
--- 5280,5284 ----
## ----------------------- ##
! This file was extended by $as_me (readline 4.3) 2.52, executed with
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
***************
*** 4845,4849 ****
"default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
! *) { { echo "$as_me:4847: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
--- 5302,5306 ----
"default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
! *) { { echo "$as_me:5304: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
***************
*** 4965,4968 ****
--- 5422,5429 ----
s,@SHLIB_MAJOR@,$SHLIB_MAJOR,;t t
s,@SHLIB_MINOR@,$SHLIB_MINOR,;t t
+ s,@STATIC_TARGET@,$STATIC_TARGET,;t t
+ s,@SHARED_TARGET@,$SHARED_TARGET,;t t
+ s,@STATIC_INSTALL_TARGET@,$STATIC_INSTALL_TARGET,;t t
+ s,@SHARED_INSTALL_TARGET@,$SHARED_INSTALL_TARGET,;t t
s,@BUILD_DIR@,$BUILD_DIR,;t t
s,@LOCAL_CFLAGS@,$LOCAL_CFLAGS,;t t
***************
*** 5086,5090 ****
if test x"$ac_file" != x-; then
! { echo "$as_me:5088: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
--- 5547,5551 ----
if test x"$ac_file" != x-; then
! { echo "$as_me:5549: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
***************
*** 5104,5108 ****
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
! test -f "$f" || { { echo "$as_me:5106: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
--- 5565,5569 ----
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
! test -f "$f" || { { echo "$as_me:5567: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
***************
*** 5117,5121 ****
else
# /dev/null tree
! { { echo "$as_me:5119: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
--- 5578,5582 ----
else
# /dev/null tree
! { { echo "$as_me:5580: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
***************
*** 5178,5182 ****
esac
! test x"$ac_file" != x- && { echo "$as_me:5180: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
--- 5639,5643 ----
esac
! test x"$ac_file" != x- && { echo "$as_me:5641: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
***************
*** 5189,5193 ****
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
! test -f "$f" || { { echo "$as_me:5191: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
--- 5650,5654 ----
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
! test -f "$f" || { { echo "$as_me:5652: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
***************
*** 5202,5206 ****
else
# /dev/null tree
! { { echo "$as_me:5204: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
--- 5663,5667 ----
else
# /dev/null tree
! { { echo "$as_me:5665: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
***************
*** 5319,5323 ****
if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
! { echo "$as_me:5321: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
--- 5780,5784 ----
if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
! { echo "$as_me:5782: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
diff -Nrc2 readline-4.2a/configure.in readline-4.3/configure.in
*** readline-4.2a/configure.in Mon Oct 29 10:20:33 2001
--- readline-4.3/configure.in Wed Feb 20 10:05:17 2002
***************
*** 5,11 ****
dnl
dnl Process this file with autoconf to produce a configure script.
! AC_REVISION([for Readline 4.2a, version 2.40, from autoconf version] AC_ACVERSION)
! AC_INIT(readline, 4.2a, bug-readline@gnu.org)
dnl make sure we are using a recent autoconf version
--- 5,11 ----
dnl
dnl Process this file with autoconf to produce a configure script.
! AC_REVISION([for Readline 4.3, version 2.45, from autoconf version] AC_ACVERSION)
! AC_INIT(readline, 4.3, bug-readline@gnu.org)
dnl make sure we are using a recent autoconf version
***************
*** 17,21 ****
dnl update the value of RL_READLINE_VERSION in readline.h when this changes
! LIBVERSION=4.2a
AC_CANONICAL_HOST
--- 17,21 ----
dnl update the value of RL_READLINE_VERSION in readline.h when this changes
! LIBVERSION=4.3
AC_CANONICAL_HOST
***************
*** 23,30 ****
dnl configure defaults
opt_curses=no
- opt_shared=no
dnl arguments to configure
! AC_ARG_WITH(curses, --with-curses use the curses library instead of the termcap library,opt_curses=$withval)
if test "$opt_curses" = "yes"; then
--- 23,29 ----
dnl configure defaults
opt_curses=no
dnl arguments to configure
! AC_ARG_WITH(curses, AC_HELP_STRING([--with-curses], [use the curses library instead of the termcap library]), opt_curses=$withval)
if test "$opt_curses" = "yes"; then
***************
*** 32,35 ****
--- 31,41 ----
fi
+ dnl option parsing for optional features
+ opt_static_libs=yes
+ opt_shared_libs=yes
+
+ AC_ARG_ENABLE(shared, AC_HELP_STRING([--enable-shared], [build shared libraries [[default=YES]]]), opt_shared_libs=$enableval)
+ AC_ARG_ENABLE(static, AC_HELP_STRING([--enable-static], [build static libraries [[default=YES]]]), opt_static_libs=$enableval)
+
echo ""
echo "Beginning configuration for readline-$LIBVERSION for ${host_cpu}-${host_vendor}-${host_os}"
***************
*** 60,63 ****
--- 66,70 ----
AC_C_CONST
AC_C_PROTOTYPES
+ AC_C_CHAR_UNSIGNED
AC_TYPE_SIGNAL
***************
*** 103,109 ****
BASH_CHECK_LIB_TERMCAP
if test "$TERMCAP_LIB" = "./lib/termcap/libtermcap.a"; then
! TERMCAP_LIB=-ltermcap #default
fi
case "$host_cpu" in
*cray*) LOCAL_CFLAGS=-DCRAY ;;
--- 110,122 ----
BASH_CHECK_LIB_TERMCAP
if test "$TERMCAP_LIB" = "./lib/termcap/libtermcap.a"; then
! if test "$prefer_curses" = yes; then
! TERMCAP_LIB=-lcurses
! else
! TERMCAP_LIB=-ltermcap #default
! fi
fi
+ BASH_CHECK_MULTIBYTE
+
case "$host_cpu" in
*cray*) LOCAL_CFLAGS=-DCRAY ;;
***************
*** 137,140 ****
--- 150,159 ----
AC_MSG_RESULT($SHLIB_STATUS)
+ # SHLIB_STATUS is either `supported' or `unsupported'. If it's
+ # `unsupported', turn off any default shared library building
+ if test "$SHLIB_STATUS" = 'unsupported'; then
+ opt_shared_libs=no
+ fi
+
# shared library versioning
# quoted for m4 so I can use character classes
***************
*** 144,147 ****
--- 163,180 ----
AC_SUBST(SHLIB_MINOR)
fi
+
+ if test "$opt_static_libs" = "yes"; then
+ STATIC_TARGET=static
+ STATIC_INSTALL_TARGET=install-static
+ fi
+ if test "$opt_shared_libs" = "yes"; then
+ SHARED_TARGET=shared
+ SHARED_INSTALL_TARGET=install-shared
+ fi
+
+ AC_SUBST(STATIC_TARGET)
+ AC_SUBST(SHARED_TARGET)
+ AC_SUBST(STATIC_INSTALL_TARGET)
+ AC_SUBST(SHARED_INSTALL_TARGET)
case "$host_os" in
diff -Nrc2 readline-4.2a/display.c readline-4.3/display.c
*** readline-4.2a/display.c Tue Oct 30 16:11:44 2001
--- readline-4.3/display.c Tue Jun 4 10:54:47 2002
***************
*** 44,47 ****
--- 44,48 ----
/* System-specific feature definitions and include files. */
#include "rldefs.h"
+ #include "rlmbutil.h"
/* Termcap library stuff. */
***************
*** 66,72 ****
static void space_to_eol PARAMS((int));
static void delete_chars PARAMS((int));
! static void insert_some_chars PARAMS((char *, int));
static void cr PARAMS((void));
static int *inv_lbreaks, *vis_lbreaks;
static int inv_lbsize, vis_lbsize;
--- 67,80 ----
static void space_to_eol PARAMS((int));
static void delete_chars PARAMS((int));
! static void insert_some_chars PARAMS((char *, int, int));
static void cr PARAMS((void));
+ #if defined (HANDLE_MULTIBYTE)
+ static int _rl_col_width PARAMS((char *, int, int));
+ static int *_rl_wrapped_line;
+ #else
+ # define _rl_col_width(l, s, e) (((e) <= (s)) ? 0 : (e) - (s))
+ #endif
+
static int *inv_lbreaks, *vis_lbreaks;
static int inv_lbsize, vis_lbsize;
***************
*** 360,363 ****
--- 368,374 ----
inv_lbreaks = (int *)xmalloc (inv_lbsize * sizeof (int));
vis_lbreaks = (int *)xmalloc (vis_lbsize * sizeof (int));
+ #if defined (HANDLE_MULTIBYTE)
+ _rl_wrapped_line = (int *)xmalloc (vis_lbsize * sizeof (int));
+ #endif
inv_lbreaks[0] = vis_lbreaks[0] = 0;
}
***************
*** 373,376 ****
--- 384,394 ----
int newlines, lpos, temp;
char *prompt_this_line;
+ #if defined (HANDLE_MULTIBYTE)
+ wchar_t wc;
+ size_t wc_bytes;
+ int wc_width;
+ mbstate_t ps;
+ int _rl_wrapped_multicolumn = 0;
+ #endif
if (!readline_echoing_p)
***************
*** 473,477 ****
} \
} while (0)
!
#define CHECK_LPOS() \
do { \
--- 491,513 ----
} \
} while (0)
!
! #if defined (HANDLE_MULTIBYTE)
! #define CHECK_LPOS() \
! do { \
! lpos++; \
! if (lpos >= _rl_screenwidth) \
! { \
! if (newlines >= (inv_lbsize - 2)) \
! { \
! inv_lbsize *= 2; \
! inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
! _rl_wrapped_line = (int *)xrealloc (_rl_wrapped_line, inv_lbsize * sizeof (int)); \
! } \
! inv_lbreaks[++newlines] = out; \
! _rl_wrapped_line[newlines] = _rl_wrapped_multicolumn; \
! lpos = 0; \
! } \
! } while (0)
! #else
#define CHECK_LPOS() \
do { \
***************
*** 488,495 ****
--- 524,535 ----
} \
} while (0)
+ #endif
/* inv_lbreaks[i] is where line i starts in the buffer. */
inv_lbreaks[newlines = 0] = 0;
lpos = out - wrap_offset;
+ #if defined (HANDLE_MULTIBYTE)
+ memset (_rl_wrapped_line, 0, vis_lbsize);
+ #endif
/* prompt_invis_chars_first_line is the number of invisible characters in
***************
*** 509,513 ****
--- 549,557 ----
prompts that exceed two physical lines? */
temp = ((newlines + 1) * _rl_screenwidth) +
+ #if 0
((newlines == 0) ? prompt_invis_chars_first_line : 0) +
+ #else
+ ((newlines == 0 && local_prompt_prefix == 0) ? prompt_invis_chars_first_line : 0) +
+ #endif
((newlines == 1) ? wrap_offset : 0);
***************
*** 524,531 ****
--- 568,609 ----
This handles expanding tabs for display and displaying meta characters. */
lb_linenum = 0;
+ #if defined (HANDLE_MULTIBYTE)
+ in = 0;
+ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+ {
+ memset (&ps, 0, sizeof (mbstate_t));
+ wc_bytes = mbrtowc (&wc, rl_line_buffer, rl_end, &ps);
+ }
+ else
+ wc_bytes = 1;
+ while (in < rl_end)
+ #else
for (in = 0; in < rl_end; in++)
+ #endif
{
c = (unsigned char)rl_line_buffer[in];
+ #if defined (HANDLE_MULTIBYTE)
+ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+ {
+ if (wc_bytes == (size_t)-1 || wc_bytes == (size_t)-2)
+ {
+ /* Byte sequence is invalid or shortened. Assume that the
+ first byte represents a character. */
+ wc_bytes = 1;
+ /* Assume that a character occupies a single column. */
+ wc_width = 1;
+ memset (&ps, 0, sizeof (mbstate_t));
+ }
+ else if (wc_bytes == (size_t)0)
+ break; /* Found '\0' */
+ else
+ {
+ temp = wcwidth (wc);
+ wc_width = (temp < 0) ? 1 : temp;
+ }
+ }
+ #endif
+
if (out + 8 >= line_size) /* XXX - 8 for \t */
{
***************
*** 542,546 ****
--- 620,628 ----
}
+ #if defined (HANDLE_MULTIBYTE)
+ if (META_CHAR (c) && _rl_output_meta_chars == 0) /* XXX - clean up */
+ #else
if (META_CHAR (c))
+ #endif
{
if (_rl_output_meta_chars == 0)
***************
*** 611,617 ****
--- 693,742 ----
else
{
+ #if defined (HANDLE_MULTIBYTE)
+ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+ {
+ register int i;
+
+ _rl_wrapped_multicolumn = 0;
+
+ if (_rl_screenwidth < lpos + wc_width)
+ for (i = lpos; i < _rl_screenwidth; i++)
+ {
+ /* The space will be removed in update_line() */
+ line[out++] = ' ';
+ _rl_wrapped_multicolumn++;
+ CHECK_LPOS();
+ }
+ if (in == rl_point)
+ {
+ c_pos = out;
+ lb_linenum = newlines;
+ }
+ for (i = in; i < in+wc_bytes; i++)
+ line[out++] = rl_line_buffer[i];
+ for (i = 0; i < wc_width; i++)
+ CHECK_LPOS();
+ }
+ else
+ {
+ line[out++] = c;
+ CHECK_LPOS();
+ }
+ #else
line[out++] = c;
CHECK_LPOS();
+ #endif
+ }
+
+ #if defined (HANDLE_MULTIBYTE)
+ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+ {
+ in += wc_bytes;
+ wc_bytes = mbrtowc (&wc, rl_line_buffer + in, rl_end - in, &ps);
}
+ else
+ in++;
+ #endif
+
}
line[out] = '\0';
***************
*** 651,655 ****
not the first. */
if (out >= _rl_screenchars)
! out = _rl_screenchars - 1;
/* The first line is at character position 0 in the buffer. The
--- 776,785 ----
not the first. */
if (out >= _rl_screenchars)
! {
! if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
! out = _rl_find_prev_mbchar (line, _rl_screenchars, MB_FIND_ANY);
! else
! out = _rl_screenchars - 1;
! }
/* The first line is at character position 0 in the buffer. The
***************
*** 737,741 ****
#endif
_rl_output_some_chars (local_prompt, nleft);
! _rl_last_c_pos = nleft;
}
--- 867,874 ----
#endif
_rl_output_some_chars (local_prompt, nleft);
! if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
! _rl_last_c_pos = _rl_col_width(local_prompt, 0, nleft);
! else
! _rl_last_c_pos = nleft;
}
***************
*** 753,760 ****
{
_rl_backspace (_rl_last_c_pos - nleft);
! _rl_last_c_pos = nleft;
}
! if (nleft != _rl_last_c_pos)
_rl_move_cursor_relative (nleft, &invisible_line[pos]);
}
--- 886,898 ----
{
_rl_backspace (_rl_last_c_pos - nleft);
! if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
! _rl_last_c_pos = _rl_col_width (&visible_line[pos], 0, nleft);
! else
! _rl_last_c_pos = nleft;
}
! if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
! _rl_move_cursor_relative (nleft, &invisible_line[pos]);
! else if (nleft != _rl_last_c_pos)
_rl_move_cursor_relative (nleft, &invisible_line[pos]);
}
***************
*** 901,904 ****
--- 1039,1047 ----
int temp, lendiff, wsatend, od, nd;
int current_invis_chars;
+ int col_lendiff, col_temp;
+ #if defined (HANDLE_MULTIBYTE)
+ mbstate_t ps_new, ps_old;
+ int new_offset, old_offset, tmp;
+ #endif
/* If we're at the right edge of a terminal that supports xn, we're
***************
*** 909,925 ****
temp = _rl_last_c_pos - W_OFFSET(_rl_last_v_pos, visible_wrap_offset);
if (temp == _rl_screenwidth && _rl_term_autowrap && !_rl_horizontal_scroll_mode
! && _rl_last_v_pos == current_line - 1)
{
! if (new[0])
! putc (new[0], rl_outstream);
else
! putc (' ', rl_outstream);
! _rl_last_c_pos = 1; /* XXX */
! _rl_last_v_pos++;
! if (old[0] && new[0])
! old[0] = new[0];
}
/* Find first difference. */
for (ofd = old, nfd = new;
(ofd - old < omax) && *ofd && (*ofd == *nfd);
--- 1052,1146 ----
temp = _rl_last_c_pos - W_OFFSET(_rl_last_v_pos, visible_wrap_offset);
if (temp == _rl_screenwidth && _rl_term_autowrap && !_rl_horizontal_scroll_mode
! && _rl_last_v_pos == current_line - 1)
{
! #if defined (HANDLE_MULTIBYTE)
! if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
! {
! wchar_t wc;
! mbstate_t ps;
! int tempwidth, bytes;
! size_t ret;
!
! /* This fixes only double-column characters, but if the wrapped
! character comsumes more than three columns, spaces will be
! inserted in the string buffer. */
! if (_rl_wrapped_line[current_line] > 0)
! _rl_clear_to_eol (_rl_wrapped_line[current_line]);
!
! memset (&ps, 0, sizeof (mbstate_t));
! ret = mbrtowc (&wc, new, MB_CUR_MAX, &ps);
! if (ret == (size_t)-1 || ret == (size_t)-2)
! {
! tempwidth = 1;
! ret = 1;
! }
! else if (ret == 0)
! tempwidth = 0;
! else
! tempwidth = wcwidth (wc);
!
! if (tempwidth > 0)
! {
! int count;
! bytes = ret;
! for (count = 0; count < bytes; count++)
! putc (new[count], rl_outstream);
! _rl_last_c_pos = tempwidth;
! _rl_last_v_pos++;
! memset (&ps, 0, sizeof (mbstate_t));
! ret = mbrtowc (&wc, old, MB_CUR_MAX, &ps);
! if (ret != 0 && bytes != 0)
! {
! if (ret == (size_t)-1 || ret == (size_t)-2)
! memmove (old+bytes, old+1, strlen (old+1));
! else
! memmove (old+bytes, old+ret, strlen (old+ret));
! memcpy (old, new, bytes);
! }
! }
! else
! {
! putc (' ', rl_outstream);
! _rl_last_c_pos = 1;
! _rl_last_v_pos++;
! if (old[0] && new[0])
! old[0] = new[0];
! }
! }
else
! #endif
! {
! if (new[0])
! putc (new[0], rl_outstream);
! else
! putc (' ', rl_outstream);
! _rl_last_c_pos = 1; /* XXX */
! _rl_last_v_pos++;
! if (old[0] && new[0])
! old[0] = new[0];
! }
}
+
/* Find first difference. */
+ #if defined (HANDLE_MULTIBYTE)
+ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+ {
+ memset (&ps_new, 0, sizeof(mbstate_t));
+ memset (&ps_old, 0, sizeof(mbstate_t));
+
+ new_offset = old_offset = 0;
+ for (ofd = old, nfd = new;
+ (ofd - old < omax) && *ofd &&
+ _rl_compare_chars(old, old_offset, &ps_old, new, new_offset, &ps_new); )
+ {
+ old_offset = _rl_find_next_mbchar (old, old_offset, 1, MB_FIND_ANY);
+ new_offset = _rl_find_next_mbchar (new, new_offset, 1, MB_FIND_ANY);
+ ofd = old + old_offset;
+ nfd = new + new_offset;
+ }
+ }
+ else
+ #endif
for (ofd = old, nfd = new;
(ofd - old < omax) && *ofd && (*ofd == *nfd);
***************
*** 938,941 ****
--- 1159,1189 ----
wsatend = 1; /* flag for trailing whitespace */
+
+ #if defined (HANDLE_MULTIBYTE)
+ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+ {
+ ols = old + _rl_find_prev_mbchar (old, oe - old, MB_FIND_ANY);
+ nls = new + _rl_find_prev_mbchar (new, ne - new, MB_FIND_ANY);
+ while ((ols > ofd) && (nls > nfd))
+ {
+ memset (&ps_old, 0, sizeof (mbstate_t));
+ memset (&ps_new, 0, sizeof (mbstate_t));
+
+ _rl_adjust_point (old, ols - old, &ps_old);
+ _rl_adjust_point (new, nls - new, &ps_new);
+
+ if (_rl_compare_chars (old, ols - old, &ps_old, new, nls - new, &ps_new) == 0)
+ break;
+
+ if (*ols == ' ')
+ wsatend = 0;
+
+ ols = old + _rl_find_prev_mbchar (old, ols - old, MB_FIND_ANY);
+ nls = new + _rl_find_prev_mbchar (new, nls - new, MB_FIND_ANY);
+ }
+ }
+ else
+ {
+ #endif /* HANDLE_MULTIBYTE */
ols = oe - 1; /* find last same */
nls = ne - 1;
***************
*** 947,950 ****
--- 1195,1201 ----
nls--;
}
+ #if defined (HANDLE_MULTIBYTE)
+ }
+ #endif
if (wsatend)
***************
*** 953,962 ****
nls = ne;
}
else if (*ols != *nls)
{
if (*ols) /* don't step past the NUL */
! ols++;
if (*nls)
! nls++;
}
--- 1204,1230 ----
nls = ne;
}
+ #if defined (HANDLE_MULTIBYTE)
+ /* This may not work for stateful encoding, but who cares? To handle
+ stateful encoding properly, we have to scan each string from the
+ beginning and compare. */
+ else if (_rl_compare_chars (ols, 0, NULL, nls, 0, NULL) == 0)
+ #else
else if (*ols != *nls)
+ #endif
{
if (*ols) /* don't step past the NUL */
! {
! if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
! ols = old + _rl_find_next_mbchar (old, ols - old, 1, MB_FIND_ANY);
! else
! ols++;
! }
if (*nls)
! {
! if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
! nls = new + _rl_find_next_mbchar (new, nls - new, 1, MB_FIND_ANY);
! else
! nls++;
! }
}
***************
*** 994,1004 ****
#endif
_rl_output_some_chars (local_prompt, lendiff);
! _rl_last_c_pos = lendiff;
}
_rl_move_cursor_relative (od, old);
! /* if (len (new) > len (old)) */
lendiff = (nls - nfd) - (ols - ofd);
/* If we are changing the number of invisible characters in a line, and
--- 1262,1282 ----
#endif
_rl_output_some_chars (local_prompt, lendiff);
! if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
! _rl_last_c_pos = _rl_col_width (local_prompt, 0, lendiff);
! else
! _rl_last_c_pos = lendiff;
}
_rl_move_cursor_relative (od, old);
! /* if (len (new) > len (old))
! lendiff == difference in buffer
! col_lendiff == difference on screen
! When not using multibyte characters, these are equal */
lendiff = (nls - nfd) - (ols - ofd);
+ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+ col_lendiff = _rl_col_width (new, nfd - new, nls - new) - _rl_col_width (old, ofd - old, ols - old);
+ else
+ col_lendiff = lendiff;
/* If we are changing the number of invisible characters in a line, and
***************
*** 1007,1015 ****
if (current_line == 0 && !_rl_horizontal_scroll_mode &&
current_invis_chars != visible_wrap_offset)
! lendiff += visible_wrap_offset - current_invis_chars;
/* Insert (diff (len (old), len (new)) ch. */
temp = ne - nfd;
! if (lendiff > 0)
{
/* Non-zero if we're increasing the number of lines. */
--- 1285,1309 ----
if (current_line == 0 && !_rl_horizontal_scroll_mode &&
current_invis_chars != visible_wrap_offset)
! {
! if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
! {
! lendiff += visible_wrap_offset - current_invis_chars;
! col_lendiff += visible_wrap_offset - current_invis_chars;
! }
! else
! {
! lendiff += visible_wrap_offset - current_invis_chars;
! col_lendiff = lendiff;
! }
! }
/* Insert (diff (len (old), len (new)) ch. */
temp = ne - nfd;
! if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
! col_temp = _rl_col_width (new, nfd - new, ne - new);
! else
! col_temp = temp;
!
! if (col_lendiff > 0) /* XXX - was lendiff */
{
/* Non-zero if we're increasing the number of lines. */
***************
*** 1019,1023 ****
of lines, make sure we actually cause the new line to wrap
around on auto-wrapping terminals. */
! if (_rl_terminal_can_insert && ((2 * temp) >= lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl))
{
/* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and
--- 1313,1317 ----
of lines, make sure we actually cause the new line to wrap
around on auto-wrapping terminals. */
! if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl))
{
/* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and
***************
*** 1028,1033 ****
lendiff <= prompt_visible_length || !current_invis_chars))
{
! insert_some_chars (nfd, lendiff);
! _rl_last_c_pos += lendiff;
}
else if (*ols == 0)
--- 1322,1327 ----
lendiff <= prompt_visible_length || !current_invis_chars))
{
! insert_some_chars (nfd, lendiff, col_lendiff);
! _rl_last_c_pos += col_lendiff;
}
else if (*ols == 0)
***************
*** 1038,1042 ****
assumes you've done the insert because you can. */
_rl_output_some_chars (nfd, lendiff);
! _rl_last_c_pos += lendiff;
}
else
--- 1332,1336 ----
assumes you've done the insert because you can. */
_rl_output_some_chars (nfd, lendiff);
! _rl_last_c_pos += col_lendiff;
}
else
***************
*** 1046,1050 ****
is a dumb update. */
_rl_output_some_chars (nfd, temp);
! _rl_last_c_pos += temp;
return;
}
--- 1340,1344 ----
is a dumb update. */
_rl_output_some_chars (nfd, temp);
! _rl_last_c_pos += col_temp;
return;
}
***************
*** 1054,1058 ****
{
_rl_output_some_chars (nfd + lendiff, temp - lendiff);
! _rl_last_c_pos += temp - lendiff;
}
}
--- 1348,1356 ----
{
_rl_output_some_chars (nfd + lendiff, temp - lendiff);
! #if 0
! _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-lendiff) - col_lendiff;
! #else
! _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-col_lendiff);
! #endif
}
}
***************
*** 1061,1065 ****
/* cannot insert chars, write to EOL */
_rl_output_some_chars (nfd, temp);
! _rl_last_c_pos += temp;
}
}
--- 1359,1363 ----
/* cannot insert chars, write to EOL */
_rl_output_some_chars (nfd, temp);
! _rl_last_c_pos += col_temp;
}
}
***************
*** 1067,1071 ****
{
/* If possible and inexpensive to use terminal deletion, then do so. */
! if (_rl_term_dc && (2 * temp) >= -lendiff)
{
/* If all we're doing is erasing the invisible characters in the
--- 1365,1369 ----
{
/* If possible and inexpensive to use terminal deletion, then do so. */
! if (_rl_term_dc && (2 * col_temp) >= -col_lendiff)
{
/* If all we're doing is erasing the invisible characters in the
***************
*** 1074,1081 ****
if (_rl_horizontal_scroll_mode && _rl_last_c_pos == 0 &&
-lendiff == visible_wrap_offset)
! lendiff = 0;
! if (lendiff)
! delete_chars (-lendiff); /* delete (diff) characters */
/* Copy (new) chars to screen from first diff to last match */
--- 1372,1379 ----
if (_rl_horizontal_scroll_mode && _rl_last_c_pos == 0 &&
-lendiff == visible_wrap_offset)
! col_lendiff = 0;
! if (col_lendiff)
! delete_chars (-col_lendiff); /* delete (diff) characters */
/* Copy (new) chars to screen from first diff to last match */
***************
*** 1084,1088 ****
{
_rl_output_some_chars (nfd, temp);
! _rl_last_c_pos += temp;
}
}
--- 1382,1386 ----
{
_rl_output_some_chars (nfd, temp);
! _rl_last_c_pos += _rl_col_width (nfd, 0, temp);;
}
}
***************
*** 1093,1105 ****
{
_rl_output_some_chars (nfd, temp);
! _rl_last_c_pos += temp;
}
lendiff = (oe - old) - (ne - new);
! if (lendiff)
{
if (_rl_term_autowrap && current_line < inv_botlin)
! space_to_eol (lendiff);
else
! _rl_clear_to_eol (lendiff);
}
}
--- 1391,1408 ----
{
_rl_output_some_chars (nfd, temp);
! _rl_last_c_pos += col_temp;
}
lendiff = (oe - old) - (ne - new);
! if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
! col_lendiff = _rl_col_width (old, 0, oe - old) - _rl_col_width (new, 0, ne - new);
! else
! col_lendiff = lendiff;
!
! if (col_lendiff)
{
if (_rl_term_autowrap && current_line < inv_botlin)
! space_to_eol (col_lendiff);
else
! _rl_clear_to_eol (col_lendiff);
}
}
***************
*** 1147,1151 ****
l = strlen (prompt_last_line);
! _rl_last_c_pos = l;
/* Dissect prompt_last_line into screen lines. Note that here we have
--- 1450,1457 ----
l = strlen (prompt_last_line);
! if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
! _rl_last_c_pos = _rl_col_width (prompt_last_line, 0, l);
! else
! _rl_last_c_pos = l;
/* Dissect prompt_last_line into screen lines. Note that here we have
***************
*** 1202,1206 ****
--- 1508,1519 ----
/* If we don't have to do anything, then return. */
+ #if defined (HANDLE_MULTIBYTE)
+ /* If we have multibyte characters, NEW is indexed by the buffer point in
+ a multibyte string, but _rl_last_c_pos is the display position. In
+ this case, NEW's display position is not obvious. */
+ if ((MB_CUR_MAX == 1 || rl_byte_oriented ) && _rl_last_c_pos == new) return;
+ #else
if (_rl_last_c_pos == new) return;
+ #endif
/* It may be faster to output a CR, and then move forwards instead
***************
*** 1232,1248 ****
#if defined (HACK_TERMCAP_MOTION)
if (_rl_term_forward_char)
for (i = _rl_last_c_pos; i < new; i++)
! tputs (_rl_term_forward_char, 1, _rl_output_character_function);
else
for (i = _rl_last_c_pos; i < new; i++)
putc (data[i], rl_outstream);
! #else
! for (i = _rl_last_c_pos; i < new; i++)
! putc (data[i], rl_outstream);
! #endif /* HACK_TERMCAP_MOTION */
}
else if (_rl_last_c_pos > new)
! _rl_backspace (_rl_last_c_pos - new);
! _rl_last_c_pos = new;
}
--- 1545,1611 ----
#if defined (HACK_TERMCAP_MOTION)
if (_rl_term_forward_char)
+ {
+ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+ {
+ int width;
+ width = _rl_col_width (data, _rl_last_c_pos, new);
+ for (i = 0; i < width; i++)
+ tputs (_rl_term_forward_char, 1, _rl_output_character_function);
+ }
+ else
+ {
+ for (i = _rl_last_c_pos; i < new; i++)
+ tputs (_rl_term_forward_char, 1, _rl_output_character_function);
+ }
+ }
+ else if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+ {
+ tputs (_rl_term_cr, 1, _rl_output_character_function);
+ for (i = 0; i < new; i++)
+ putc (data[i], rl_outstream);
+ }
+ else
for (i = _rl_last_c_pos; i < new; i++)
! putc (data[i], rl_outstream);
!
! #else /* !HACK_TERMCAP_MOTION */
!
! if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
! {
! tputs (_rl_term_cr, 1, _rl_output_character_function);
! for (i = 0; i < new; i++)
! putc (data[i], rl_outstream);
! }
else
for (i = _rl_last_c_pos; i < new; i++)
putc (data[i], rl_outstream);
!
! #endif /* !HACK_TERMCAP_MOTION */
!
}
+ #if defined (HANDLE_MULTIBYTE)
+ /* NEW points to the buffer point, but _rl_last_c_pos is the display point.
+ The byte length of the string is probably bigger than the column width
+ of the string, which means that if NEW == _rl_last_c_pos, then NEW's
+ display point is less than _rl_last_c_pos. */
+ else if (_rl_last_c_pos >= new)
+ #else
else if (_rl_last_c_pos > new)
! #endif
! {
! if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
! {
! tputs (_rl_term_cr, 1, _rl_output_character_function);
! for (i = 0; i < new; i++)
! putc (data[i], rl_outstream);
! }
! else
! _rl_backspace (_rl_last_c_pos - new);
! }
!
! if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
! _rl_last_c_pos = _rl_col_width (data, 0, new);
! else
! _rl_last_c_pos = new;
}
***************
*** 1515,1529 ****
}
! /* Insert COUNT characters from STRING to the output stream. */
static void
! insert_some_chars (string, count)
char *string;
! int count;
{
/* If IC is defined, then we do not have to "enter" insert mode. */
if (_rl_term_IC)
{
char *buffer;
! buffer = tgoto (_rl_term_IC, 0, count);
tputs (buffer, 1, _rl_output_character_function);
_rl_output_some_chars (string, count);
--- 1878,1898 ----
}
! /* Insert COUNT characters from STRING to the output stream at column COL. */
static void
! insert_some_chars (string, count, col)
char *string;
! int count, col;
{
+ /* DEBUGGING */
+ if (MB_CUR_MAX == 1 || rl_byte_oriented)
+ if (count != col)
+ fprintf(stderr, "readline: debug: insert_some_chars: count (%d) != col (%d)\n", count, col);
+
/* If IC is defined, then we do not have to "enter" insert mode. */
if (_rl_term_IC)
{
char *buffer;
!
! buffer = tgoto (_rl_term_IC, 0, col);
tputs (buffer, 1, _rl_output_character_function);
_rl_output_some_chars (string, count);
***************
*** 1541,1545 ****
if (_rl_term_ic && *_rl_term_ic)
{
! for (i = count; i--; )
tputs (_rl_term_ic, 1, _rl_output_character_function);
}
--- 1910,1914 ----
if (_rl_term_ic && *_rl_term_ic)
{
! for (i = col; i--; )
tputs (_rl_term_ic, 1, _rl_output_character_function);
}
***************
*** 1596,1604 ****
{
char *last_line;
! #if 0
! last_line = &visible_line[inv_lbreaks[_rl_vis_botlin]];
! #else
last_line = &visible_line[vis_lbreaks[_rl_vis_botlin]];
- #endif
_rl_move_cursor_relative (_rl_screenwidth - 1, last_line);
_rl_clear_to_eol (0);
--- 1965,1970 ----
{
char *last_line;
!
last_line = &visible_line[vis_lbreaks[_rl_vis_botlin]];
_rl_move_cursor_relative (_rl_screenwidth - 1, last_line);
_rl_clear_to_eol (0);
***************
*** 1745,1746 ****
--- 2111,2196 ----
return ret;
}
+
+ #if defined (HANDLE_MULTIBYTE)
+ /* Calculate the number of screen columns occupied by STR from START to END.
+ In the case of multibyte characters with stateful encoding, we have to
+ scan from the beginning of the string to take the state into account. */
+ static int
+ _rl_col_width (str, start, end)
+ char *str;
+ int start, end;
+ {
+ wchar_t wc;
+ mbstate_t ps = {0};
+ int tmp, point, width, max;
+
+ if (end <= start)
+ return 0;
+
+ point = 0;
+ max = end;
+
+ while (point < start)
+ {
+ tmp = mbrlen (str + point, max, &ps);
+ if ((size_t)tmp == (size_t)-1 || (size_t)tmp == (size_t)-2)
+ {
+ /* In this case, the bytes are invalid or too short to compose a
+ multibyte character, so we assume that the first byte represents
+ a single character. */
+ point++;
+ max--;
+
+ /* Clear the state of the byte sequence, because in this case the
+ effect of mbstate is undefined. */
+ memset (&ps, 0, sizeof (mbstate_t));
+ }
+ else if (tmp == 0)
+ break; /* Found '\0' */
+ else
+ {
+ point += tmp;
+ max -= tmp;
+ }
+ }
+
+ /* If START is not a byte that starts a character, then POINT will be
+ greater than START. In this case, assume that (POINT - START) gives
+ a byte count that is the number of columns of difference. */
+ width = point - start;
+
+ while (point < end)
+ {
+ tmp = mbrtowc (&wc, str + point, max, &ps);
+ if ((size_t)tmp == (size_t)-1 || (size_t)tmp == (size_t)-2)
+ {
+ /* In this case, the bytes are invalid or too short to compose a
+ multibyte character, so we assume that the first byte represents
+ a single character. */
+ point++;
+ max--;
+
+ /* and assume that the byte occupies a single column. */
+ width++;
+
+ /* Clear the state of the byte sequence, because in this case the
+ effect of mbstate is undefined. */
+ memset (&ps, 0, sizeof (mbstate_t));
+ }
+ else if (tmp == 0)
+ break; /* Found '\0' */
+ else
+ {
+ point += tmp;
+ max -= tmp;
+ tmp = wcwidth(wc);
+ width += (tmp >= 0) ? tmp : 1;
+ }
+ }
+
+ width += point - end;
+
+ return width;
+ }
+ #endif /* HANDLE_MULTIBYTE */
+
diff -Nrc2 readline-4.2a/doc/Makefile.in readline-4.3/doc/Makefile.in
*** readline-4.2a/doc/Makefile.in Wed May 2 11:20:57 2001
--- readline-4.3/doc/Makefile.in Mon May 20 12:54:51 2002
***************
*** 119,126 ****
$(DVIPS) history.dvi
readline.html: ${RLSRC}
$(TEXI2HTML) -menu -monolithic -I $(TEXINPUTDIR) $(srcdir)/rlman.texinfo
sed -e 's:rlman.html:readline.html:g' rlman.html > readline.html
- $(RM) rlman.html
rluserman.html: ${RLSRC}
--- 119,128 ----
$(DVIPS) history.dvi
+ #
+ # This leaves readline.html and rlman.html -- rlman.html is for www.gnu.org
+ #
readline.html: ${RLSRC}
$(TEXI2HTML) -menu -monolithic -I $(TEXINPUTDIR) $(srcdir)/rlman.texinfo
sed -e 's:rlman.html:readline.html:g' rlman.html > readline.html
rluserman.html: ${RLSRC}
***************
*** 152,162 ****
clean:
$(RM) *.aux *.cp *.fn *.ky *.log *.pg *.toc *.tp *.vr *.cps *.pgs \
! *.fns *.kys *.tps *.vrs *.bt *.bts *.o core
! distclean: clean
$(RM) $(INTERMEDIATE_OBJ)
$(RM) Makefile
! mostlyclean: clean
maintainer-clean: clean
--- 154,169 ----
clean:
$(RM) *.aux *.cp *.fn *.ky *.log *.pg *.toc *.tp *.vr *.cps *.pgs \
! *.fns *.kys *.tps *.vrs *.bt *.bts *.o core *.core
! mostlyclean: clean
!
! distclean: clean maybe-clean
$(RM) $(INTERMEDIATE_OBJ)
$(RM) Makefile
! maybe-clean:
! -if test "X$(topdir)" != "X$(BUILD_DIR)"; then \
! $(RM) $(DIST_DOCS); \
! fi
maintainer-clean: clean
diff -Nrc2 readline-4.2a/doc/hist.texinfo readline-4.3/doc/hist.texinfo
*** readline-4.2a/doc/hist.texinfo Fri Feb 2 11:37:12 2001
--- readline-4.3/doc/hist.texinfo Tue Apr 16 17:11:02 2002
***************
*** 19,23 ****
typed input.
! Copyright (C) 1988-2001 Free Software Foundation, Inc.
Permission is granted to make and distribute verbatim copies of
--- 19,23 ----
typed input.
! Copyright (C) 1988-2002 Free Software Foundation, Inc.
Permission is granted to make and distribute verbatim copies of
***************
*** 74,78 ****
@vskip 0pt plus 1filll
! Copyright @copyright{} 1988-2001 Free Software Foundation, Inc.
@end titlepage
--- 74,78 ----
@vskip 0pt plus 1filll
! Copyright @copyright{} 1988-2002 Free Software Foundation, Inc.
@end titlepage
diff -Nrc2 readline-4.2a/doc/history.0 readline-4.3/doc/history.0
*** readline-4.2a/doc/history.0 Mon Apr 16 10:53:07 2001
--- readline-4.3/doc/history.0 Mon Mar 18 10:17:27 2002
***************
*** 9,13 ****
CCOOPPYYRRIIGGHHTT
! The GNU History Library is Copyright (C) 1989-2001 by the
Free Software Foundation, Inc.
--- 9,13 ----
CCOOPPYYRRIIGGHHTT
! The GNU History Library is Copyright (C) 1989-2002 by the
Free Software Foundation, Inc.
***************
*** 62,66 ****
! GNU History 4.2 2001 Mar 6 1
--- 62,66 ----
! GNU History 4.3 2002 January 31 1
***************
*** 128,132 ****
! GNU History 4.2 2001 Mar 6 2
--- 128,132 ----
! GNU History 4.3 2002 January 31 2
***************
*** 194,198 ****
! GNU History 4.2 2001 Mar 6 3
--- 194,198 ----
! GNU History 4.3 2002 January 31 3
***************
*** 260,264 ****
! GNU History 4.2 2001 Mar 6 4
--- 260,264 ----
! GNU History 4.3 2002 January 31 4
***************
*** 300,319 ****
_i_n_t uunnssttiiffllee__hhiissttoorryy (_v_o_i_d)
! Stop stifling the history. This returns the previous
! amount the history was stifled. The value is positive if
! the history was stifled, negative if it wasn't.
_i_n_t hhiissttoorryy__iiss__ssttiifflleedd (_v_o_i_d)
! Returns non-zero if the history is stifled, zero if it is
not.
IInnffoorrmmaattiioonn AAbboouutt tthhee HHiissttoorryy LLiisstt
! These functions return information about the entire his-
tory list or individual list entries.
_H_I_S_T___E_N_T_R_Y _*_* hhiissttoorryy__lliisstt (_v_o_i_d)
! Return a NNUULLLL terminated array of _H_I_S_T___E_N_T_R_Y _* which is
! the current input history. Element 0 of this list is the
beginning of time. If there is no history, return NNUULLLL.
--- 300,320 ----
_i_n_t uunnssttiiffllee__hhiissttoorryy (_v_o_i_d)
! Stop stifling the history. This returns the previously-
! set maximum number of history entries (as set by ssttii--
! ffllee__hhiissttoorryy(())). history was stifled. The value is posi-
! tive if the history was stifled, negative if it wasn't.
_i_n_t hhiissttoorryy__iiss__ssttiifflleedd (_v_o_i_d)
! Returns non-zero if the history is stifled, zero if it is
not.
IInnffoorrmmaattiioonn AAbboouutt tthhee HHiissttoorryy LLiisstt
! These functions return information about the entire his-
tory list or individual list entries.
_H_I_S_T___E_N_T_R_Y _*_* hhiissttoorryy__lliisstt (_v_o_i_d)
! Return a NNUULLLL terminated array of _H_I_S_T___E_N_T_R_Y _* which is
! the current input history. Element 0 of this list is the
beginning of time. If there is no history, return NNUULLLL.
***************
*** 322,330 ****
_H_I_S_T___E_N_T_R_Y _* ccuurrrreenntt__hhiissttoorryy (_v_o_i_d)
- Return the history entry at the current position, as
! GNU History 4.2 2001 Mar 6 5
--- 323,330 ----
_H_I_S_T___E_N_T_R_Y _* ccuurrrreenntt__hhiissttoorryy (_v_o_i_d)
! GNU History 4.3 2002 January 31 5
***************
*** 335,339 ****
! determined by wwhheerree__hhiissttoorryy(()). If there is no entry
there, return a NNUULLLL pointer.
--- 335,340 ----
! Return the history entry at the current position, as
! determined by wwhheerree__hhiissttoorryy(()). If there is no entry
there, return a NNUULLLL pointer.
***************
*** 344,359 ****
_i_n_t hhiissttoorryy__ttoottaall__bbyytteess (_v_o_i_d)
! Return the number of bytes that the primary history
! entries are using. This function returns the sum of the
lengths of all the lines in the history.
MMoovviinngg AArroouunndd tthhee HHiissttoorryy LLiisstt
! These functions allow the current index into the history
list to be set or changed.
_i_n_t hhiissttoorryy__sseett__ppooss (_i_n_t _p_o_s)
! Set the current history offset to _p_o_s, an absolute index
! into the list. Returns 1 on success, 0 if _p_o_s is less
than zero or greater than the number of history entries.
--- 345,360 ----
_i_n_t hhiissttoorryy__ttoottaall__bbyytteess (_v_o_i_d)
! Return the number of bytes that the primary history
! entries are using. This function returns the sum of the
lengths of all the lines in the history.
MMoovviinngg AArroouunndd tthhee HHiissttoorryy LLiisstt
! These functions allow the current index into the history
list to be set or changed.
_i_n_t hhiissttoorryy__sseett__ppooss (_i_n_t _p_o_s)
! Set the current history offset to _p_o_s, an absolute index
! into the list. Returns 1 on success, 0 if _p_o_s is less
than zero or greater than the number of history entries.
***************
*** 364,396 ****
_H_I_S_T___E_N_T_R_Y _* nneexxtt__hhiissttoorryy (_v_o_i_d)
! Move the current history offset forward to the next his-
! tory entry, and return the a pointer to that entry. If
there is no next entry, return a NNUULLLL pointer.
SSeeaarrcchhiinngg tthhee HHiissttoorryy LLiisstt
! These functions allow searching of the history list for
! entries containing a specific string. Searching may be
! performed both forward and backward from the current his-
! tory position. The search may be _a_n_c_h_o_r_e_d, meaning that
! the string must match at the beginning of the history
entry.
_i_n_t hhiissttoorryy__sseeaarrcchh (_c_o_n_s_t _c_h_a_r _*_s_t_r_i_n_g_, _i_n_t _d_i_r_e_c_t_i_o_n)
! Search the history for _s_t_r_i_n_g, starting at the current
! history offset. If _d_i_r_e_c_t_i_o_n is less than 0, then the
search is through previous entries, otherwise through sub-
! sequent entries. If _s_t_r_i_n_g is found, then the current
! history index is set to that history entry, and the value
! returned is the offset in the line of the entry where
_s_t_r_i_n_g was found. Otherwise, nothing is changed, and a -1
is returned.
! _i_n_t hhiissttoorryy__sseeaarrcchh__pprreeffiixx (_c_o_n_s_t _c_h_a_r _*_s_t_r_i_n_g_, _i_n_t
! _d_i_r_e_c_t_i_o_n)
! GNU History 4.2 2001 Mar 6 6
--- 365,396 ----
_H_I_S_T___E_N_T_R_Y _* nneexxtt__hhiissttoorryy (_v_o_i_d)
! Move the current history offset forward to the next his-
! tory entry, and return the a pointer to that entry. If
there is no next entry, return a NNUULLLL pointer.
SSeeaarrcchhiinngg tthhee HHiissttoorryy LLiisstt
! These functions allow searching of the history list for
! entries containing a specific string. Searching may be
! performed both forward and backward from the current his-
! tory position. The search may be _a_n_c_h_o_r_e_d, meaning that
! the string must match at the beginning of the history
entry.
_i_n_t hhiissttoorryy__sseeaarrcchh (_c_o_n_s_t _c_h_a_r _*_s_t_r_i_n_g_, _i_n_t _d_i_r_e_c_t_i_o_n)
! Search the history for _s_t_r_i_n_g, starting at the current
! history offset. If _d_i_r_e_c_t_i_o_n is less than 0, then the
search is through previous entries, otherwise through sub-
! sequent entries. If _s_t_r_i_n_g is found, then the current
! history index is set to that history entry, and the value
! returned is the offset in the line of the entry where
_s_t_r_i_n_g was found. Otherwise, nothing is changed, and a -1
is returned.
! _i_n_t hhiissttoorryy__sseeaarrcchh__pprreeffiixx (_c_o_n_s_t _c_h_a_r _*_s_t_r_i_n_g_, _i_n_t
! GNU History 4.3 2002 January 31 6
***************
*** 401,410 ****
! Search the history for _s_t_r_i_n_g, starting at the current
! history offset. The search is anchored: matching lines
must begin with _s_t_r_i_n_g. If _d_i_r_e_c_t_i_o_n is less than 0, then
! the search is through previous entries, otherwise through
! subsequent entries. If _s_t_r_i_n_g is found, then the current
! history index is set to that entry, and the return value
is 0. Otherwise, nothing is changed, and a -1 is
returned.
--- 401,411 ----
! _d_i_r_e_c_t_i_o_n)
! Search the history for _s_t_r_i_n_g, starting at the current
! history offset. The search is anchored: matching lines
must begin with _s_t_r_i_n_g. If _d_i_r_e_c_t_i_o_n is less than 0, then
! the search is through previous entries, otherwise through
! subsequent entries. If _s_t_r_i_n_g is found, then the current
! history index is set to that entry, and the return value
is 0. Otherwise, nothing is changed, and a -1 is
returned.
***************
*** 413,419 ****
_i_n_t _p_o_s)
Search for _s_t_r_i_n_g in the history list, starting at _p_o_s, an
! absolute index into the list. If _d_i_r_e_c_t_i_o_n is negative,
! the search proceeds backward from _p_o_s, otherwise forward.
! Returns the absolute index of the history element where
_s_t_r_i_n_g was found, or -1 otherwise.
--- 414,420 ----
_i_n_t _p_o_s)
Search for _s_t_r_i_n_g in the history list, starting at _p_o_s, an
! absolute index into the list. If _d_i_r_e_c_t_i_o_n is negative,
! the search proceeds backward from _p_o_s, otherwise forward.
! Returns the absolute index of the history element where
_s_t_r_i_n_g was found, or -1 otherwise.
***************
*** 421,445 ****
MMaannaaggiinngg tthhee HHiissttoorryy FFiillee
The History library can read the history from and write it
! to a file. This section documents the functions for man-
aging a history file.
_i_n_t rreeaadd__hhiissttoorryy (_c_o_n_s_t _c_h_a_r _*_f_i_l_e_n_a_m_e)
! Add the contents of _f_i_l_e_n_a_m_e to the history list, a line
! at a time. If _f_i_l_e_n_a_m_e is NNUULLLL, then read from _~_/_._h_i_s_-
_t_o_r_y. Returns 0 if successful, or eerrrrnnoo if not.
! _i_n_t rreeaadd__hhiissttoorryy__rraannggee (_c_o_n_s_t _c_h_a_r _*_f_i_l_e_n_a_m_e_, _i_n_t _f_r_o_m_,
_i_n_t _t_o)
! Read a range of lines from _f_i_l_e_n_a_m_e, adding them to the
! history list. Start reading at line _f_r_o_m and end at _t_o.
! If _f_r_o_m is zero, start at the beginning. If _t_o is less
! than _f_r_o_m, then read until the end of the file. If _f_i_l_e_-
! _n_a_m_e is NNUULLLL, then read from _~_/_._h_i_s_t_o_r_y. Returns 0 if
successful, or eerrrrnnoo if not.
_i_n_t wwrriittee__hhiissttoorryy (_c_o_n_s_t _c_h_a_r _*_f_i_l_e_n_a_m_e)
! Write the current history to _f_i_l_e_n_a_m_e, overwriting _f_i_l_e_-
! _n_a_m_e if necessary. If _f_i_l_e_n_a_m_e is NNUULLLL, then write the
! history list to _~_/_._h_i_s_t_o_r_y. Returns 0 on success, or
eerrrrnnoo on a read or write error.
--- 422,446 ----
MMaannaaggiinngg tthhee HHiissttoorryy FFiillee
The History library can read the history from and write it
! to a file. This section documents the functions for man-
aging a history file.
_i_n_t rreeaadd__hhiissttoorryy (_c_o_n_s_t _c_h_a_r _*_f_i_l_e_n_a_m_e)
! Add the contents of _f_i_l_e_n_a_m_e to the history list, a line
! at a time. If _f_i_l_e_n_a_m_e is NNUULLLL, then read from _~_/_._h_i_s_-
_t_o_r_y. Returns 0 if successful, or eerrrrnnoo if not.
! _i_n_t rreeaadd__hhiissttoorryy__rraannggee (_c_o_n_s_t _c_h_a_r _*_f_i_l_e_n_a_m_e_, _i_n_t _f_r_o_m_,
_i_n_t _t_o)
! Read a range of lines from _f_i_l_e_n_a_m_e, adding them to the
! history list. Start reading at line _f_r_o_m and end at _t_o.
! If _f_r_o_m is zero, start at the beginning. If _t_o is less
! than _f_r_o_m, then read until the end of the file. If _f_i_l_e_-
! _n_a_m_e is NNUULLLL, then read from _~_/_._h_i_s_t_o_r_y. Returns 0 if
successful, or eerrrrnnoo if not.
_i_n_t wwrriittee__hhiissttoorryy (_c_o_n_s_t _c_h_a_r _*_f_i_l_e_n_a_m_e)
! Write the current history to _f_i_l_e_n_a_m_e, overwriting _f_i_l_e_-
! _n_a_m_e if necessary. If _f_i_l_e_n_a_m_e is NNUULLLL, then write the
! history list to _~_/_._h_i_s_t_o_r_y. Returns 0 on success, or
eerrrrnnoo on a read or write error.
***************
*** 450,462 ****
on success, or eerrrrnnoo on a read or write error.
! _i_n_t hhiissttoorryy__ttrruunnccaattee__ffiillee (_c_o_n_s_t _c_h_a_r _*_f_i_l_e_n_a_m_e_, _i_n_t
_n_l_i_n_e_s)
! Truncate the history file _f_i_l_e_n_a_m_e, leaving only the last
! _n_l_i_n_e_s lines. If _f_i_l_e_n_a_m_e is NNUULLLL, then _~_/_._h_i_s_t_o_r_y is
! truncated. Returns 0 on success, or eerrrrnnoo on failure.
! GNU History 4.2 2001 Mar 6 7
--- 451,462 ----
on success, or eerrrrnnoo on a read or write error.
! _i_n_t hhiissttoorryy__ttrruunnccaattee__ffiillee (_c_o_n_s_t _c_h_a_r _*_f_i_l_e_n_a_m_e_, _i_n_t
_n_l_i_n_e_s)
! Truncate the history file _f_i_l_e_n_a_m_e, leaving only the last
! _n_l_i_n_e_s lines. If _f_i_l_e_n_a_m_e is NNUULLLL, then _~_/_._h_i_s_t_o_r_y is
! GNU History 4.3 2002 January 31 7
***************
*** 467,512 ****
HHiissttoorryy EExxppaannssiioonn
These functions implement history expansion.
_i_n_t hhiissttoorryy__eexxppaanndd (_c_h_a_r _*_s_t_r_i_n_g_, _c_h_a_r _*_*_o_u_t_p_u_t)
! Expand _s_t_r_i_n_g, placing the result into _o_u_t_p_u_t, a pointer
to a string. Returns:
0 If no expansions took place (or, if the only
change in the text was the removal of escape
! characters preceding the history expansion
character);
1 if expansions did take place;
-1 if there was an error in expansion;
! 2 if the returned line should be displayed,
but not executed, as with the ::pp modifier.
! If an error ocurred in expansion, then _o_u_t_p_u_t contains a
descriptive error message.
_c_h_a_r _* ggeett__hhiissttoorryy__eevveenntt (_c_o_n_s_t _c_h_a_r _*_s_t_r_i_n_g_, _i_n_t _*_c_i_n_d_e_x_,
_i_n_t _q_c_h_a_r)
! Returns the text of the history event beginning at _s_t_r_i_n_g
! + _*_c_i_n_d_e_x. _*_c_i_n_d_e_x is modified to point to after the
! event specifier. At function entry, _c_i_n_d_e_x points to the
! index into _s_t_r_i_n_g where the history event specification
! begins. _q_c_h_a_r is a character that is allowed to end the
! event specification in addition to the ``normal'' termi-
nating characters.
_c_h_a_r _*_* hhiissttoorryy__ttookkeenniizzee (_c_o_n_s_t _c_h_a_r _*_s_t_r_i_n_g)
! Return an array of tokens parsed out of _s_t_r_i_n_g, much as
! the shell might. The tokens are split on the characters
in the hhiissttoorryy__wwoorrdd__ddeelliimmiitteerrss variable, and shell quoting
conventions are obeyed.
! _c_h_a_r _* hhiissttoorryy__aarrgg__eexxttrraacctt (_i_n_t _f_i_r_s_t_, _i_n_t _l_a_s_t_, _c_o_n_s_t
_c_h_a_r _*_s_t_r_i_n_g)
! Extract a string segment consisting of the _f_i_r_s_t through
! _l_a_s_t arguments present in _s_t_r_i_n_g. Arguments are split
using hhiissttoorryy__ttookkeenniizzee(()).
HHiissttoorryy VVaarriiaabblleess
! This section describes the externally-visible variables
exported by the GNU History Library.
--- 467,515 ----
+ truncated. Returns 0 on success, or eerrrrnnoo on failure.
+
+
HHiissttoorryy EExxppaannssiioonn
These functions implement history expansion.
_i_n_t hhiissttoorryy__eexxppaanndd (_c_h_a_r _*_s_t_r_i_n_g_, _c_h_a_r _*_*_o_u_t_p_u_t)
! Expand _s_t_r_i_n_g, placing the result into _o_u_t_p_u_t, a pointer
to a string. Returns:
0 If no expansions took place (or, if the only
change in the text was the removal of escape
! characters preceding the history expansion
character);
1 if expansions did take place;
-1 if there was an error in expansion;
! 2 if the returned line should be displayed,
but not executed, as with the ::pp modifier.
! If an error ocurred in expansion, then _o_u_t_p_u_t contains a
descriptive error message.
_c_h_a_r _* ggeett__hhiissttoorryy__eevveenntt (_c_o_n_s_t _c_h_a_r _*_s_t_r_i_n_g_, _i_n_t _*_c_i_n_d_e_x_,
_i_n_t _q_c_h_a_r)
! Returns the text of the history event beginning at _s_t_r_i_n_g
! + _*_c_i_n_d_e_x. _*_c_i_n_d_e_x is modified to point to after the
! event specifier. At function entry, _c_i_n_d_e_x points to the
! index into _s_t_r_i_n_g where the history event specification
! begins. _q_c_h_a_r is a character that is allowed to end the
! event specification in addition to the ``normal'' termi-
nating characters.
_c_h_a_r _*_* hhiissttoorryy__ttookkeenniizzee (_c_o_n_s_t _c_h_a_r _*_s_t_r_i_n_g)
! Return an array of tokens parsed out of _s_t_r_i_n_g, much as
! the shell might. The tokens are split on the characters
in the hhiissttoorryy__wwoorrdd__ddeelliimmiitteerrss variable, and shell quoting
conventions are obeyed.
! _c_h_a_r _* hhiissttoorryy__aarrgg__eexxttrraacctt (_i_n_t _f_i_r_s_t_, _i_n_t _l_a_s_t_, _c_o_n_s_t
_c_h_a_r _*_s_t_r_i_n_g)
! Extract a string segment consisting of the _f_i_r_s_t through
! _l_a_s_t arguments present in _s_t_r_i_n_g. Arguments are split
using hhiissttoorryy__ttookkeenniizzee(()).
HHiissttoorryy VVaarriiaabblleess
! This section describes the externally-visible variables
exported by the GNU History Library.
***************
*** 515,528 ****
_i_n_t hhiissttoorryy__lleennggtthh
! The number of entries currently stored in the history
list.
- _i_n_t hhiissttoorryy__mmaaxx__eennttrriieess
- The maximum number of history entries. This must be
- changed using ssttiiffllee__hhiissttoorryy(()).
! GNU History 4.2 2001 Mar 6 8
--- 518,528 ----
_i_n_t hhiissttoorryy__lleennggtthh
! The number of entries currently stored in the history
list.
! GNU History 4.3 2002 January 31 8
***************
*** 533,550 ****
_c_h_a_r hhiissttoorryy__eexxppaannssiioonn__cchhaarr
The character that introduces a history event. The
! default is !!. Setting this to 0 inhibits history expan-
sion.
_c_h_a_r hhiissttoorryy__ssuubbsstt__cchhaarr
! The character that invokes word substitution if found at
the start of a line. The default is ^^.
_c_h_a_r hhiissttoorryy__ccoommmmeenntt__cchhaarr
! During tokenization, if this character is seen as the
! first character of a word, then it and all subsequent
! characters up to a newline are ignored, suppressing his-
! tory expansion for the remainder of the line. This is
disabled by default.
--- 533,554 ----
+ _i_n_t hhiissttoorryy__mmaaxx__eennttrriieess
+ The maximum number of history entries. This must be
+ changed using ssttiiffllee__hhiissttoorryy(()).
+
_c_h_a_r hhiissttoorryy__eexxppaannssiioonn__cchhaarr
The character that introduces a history event. The
! default is !!. Setting this to 0 inhibits history expan-
sion.
_c_h_a_r hhiissttoorryy__ssuubbsstt__cchhaarr
! The character that invokes word substitution if found at
the start of a line. The default is ^^.
_c_h_a_r hhiissttoorryy__ccoommmmeenntt__cchhaarr
! During tokenization, if this character is seen as the
! first character of a word, then it and all subsequent
! characters up to a newline are ignored, suppressing his-
! tory expansion for the remainder of the line. This is
disabled by default.
***************
*** 554,578 ****
_c_h_a_r _* hhiissttoorryy__nnoo__eexxppaanndd__cchhaarrss
! The list of characters which inhibit history expansion if
! found immediately following hhiissttoorryy__eexxppaannssiioonn__cchhaarr. The
default is space, tab, newline, \\rr, and ==.
_c_h_a_r _* hhiissttoorryy__sseeaarrcchh__ddeelliimmiitteerr__cchhaarrss
The list of additional characters which can delimit a his-
! tory search string, in addition to space, tab, _: and _? in
the case of a substring search. The default is empty.
_i_n_t hhiissttoorryy__qquuootteess__iinnhhiibbiitt__eexxppaannssiioonn
! If non-zero, single-quoted words are not scanned for the
history expansion character. The default value is 0.
_r_l___l_i_n_e_b_u_f___f_u_n_c___t _* hhiissttoorryy__iinnhhiibbiitt__eexxppaannssiioonn__ffuunnccttiioonn
This should be set to the address of a function that takes
! two arguments: a cchhaarr ** (_s_t_r_i_n_g) and an iinntt index into
that string (_i). It should return a non-zero value if the
history expansion starting at _s_t_r_i_n_g_[_i_] should not be per-
! formed; zero if the expansion should be done. It is
! intended for use by applications like bbaasshh that use the
! history expansion character for additional purposes. By
default, this variable is set to NNUULLLL.
--- 558,582 ----
_c_h_a_r _* hhiissttoorryy__nnoo__eexxppaanndd__cchhaarrss
! The list of characters which inhibit history expansion if
! found immediately following hhiissttoorryy__eexxppaannssiioonn__cchhaarr. The
default is space, tab, newline, \\rr, and ==.
_c_h_a_r _* hhiissttoorryy__sseeaarrcchh__ddeelliimmiitteerr__cchhaarrss
The list of additional characters which can delimit a his-
! tory search string, in addition to space, tab, _: and _? in
the case of a substring search. The default is empty.
_i_n_t hhiissttoorryy__qquuootteess__iinnhhiibbiitt__eexxppaannssiioonn
! If non-zero, single-quoted words are not scanned for the
history expansion character. The default value is 0.
_r_l___l_i_n_e_b_u_f___f_u_n_c___t _* hhiissttoorryy__iinnhhiibbiitt__eexxppaannssiioonn__ffuunnccttiioonn
This should be set to the address of a function that takes
! two arguments: a cchhaarr ** (_s_t_r_i_n_g) and an iinntt index into
that string (_i). It should return a non-zero value if the
history expansion starting at _s_t_r_i_n_g_[_i_] should not be per-
! formed; zero if the expansion should be done. It is
! intended for use by applications like bbaasshh that use the
! history expansion character for additional purposes. By
default, this variable is set to NNUULLLL.
***************
*** 582,594 ****
tory
- SSEEEE AALLSSOO
- _T_h_e _G_n_u _R_e_a_d_l_i_n_e _L_i_b_r_a_r_y, Brian Fox and Chet Ramey
- _T_h_e _G_n_u _H_i_s_t_o_r_y _L_i_b_r_a_r_y, Brian Fox and Chet Ramey
- _b_a_s_h(1)
! GNU History 4.2 2001 Mar 6 9
--- 586,594 ----
tory
! GNU History 4.3 2002 January 31 9
***************
*** 599,602 ****
--- 599,606 ----
+ SSEEEE AALLSSOO
+ _T_h_e _G_n_u _R_e_a_d_l_i_n_e _L_i_b_r_a_r_y, Brian Fox and Chet Ramey
+ _T_h_e _G_n_u _H_i_s_t_o_r_y _L_i_b_r_a_r_y, Brian Fox and Chet Ramey
+ _b_a_s_h(1)
_r_e_a_d_l_i_n_e(3)
***************
*** 609,625 ****
BBUUGG RREEPPOORRTTSS
! If you find a bug in the hhiissttoorryy library, you should
report it. But first, you should make sure that it really
is a bug, and that it appears in the latest version of the
hhiissttoorryy library that you have.
! Once you have determined that a bug actually exists, mail
! a bug report to _b_u_g_-_r_e_a_d_l_i_n_e@_g_n_u_._o_r_g. If you have a fix,
! you are welcome to mail that as well! Suggestions and
! `philosophical' bug reports may be mailed to _b_u_g_-_r_e_a_d_-
_l_i_n_e@_g_n_u_._o_r_g or posted to the Usenet newsgroup
ggnnuu..bbaasshh..bbuugg.
! Comments and bug reports concerning this manual page
should be directed to _c_h_e_t_@_i_n_s_._C_W_R_U_._E_d_u.
--- 613,629 ----
BBUUGG RREEPPOORRTTSS
! If you find a bug in the hhiissttoorryy library, you should
report it. But first, you should make sure that it really
is a bug, and that it appears in the latest version of the
hhiissttoorryy library that you have.
! Once you have determined that a bug actually exists, mail
! a bug report to _b_u_g_-_r_e_a_d_l_i_n_e@_g_n_u_._o_r_g. If you have a fix,
! you are welcome to mail that as well! Suggestions and
! `philosophical' bug reports may be mailed to _b_u_g_-_r_e_a_d_-
_l_i_n_e@_g_n_u_._o_r_g or posted to the Usenet newsgroup
ggnnuu..bbaasshh..bbuugg.
! Comments and bug reports concerning this manual page
should be directed to _c_h_e_t_@_i_n_s_._C_W_R_U_._E_d_u.
***************
*** 652,660 ****
!
!
!
!
! GNU History 4.2 2001 Mar 6 10
--- 656,660 ----
! GNU History 4.3 2002 January 31 10
diff -Nrc2 readline-4.2a/doc/history.3 readline-4.3/doc/history.3
*** readline-4.2a/doc/history.3 Mon Mar 12 05:38:09 2001
--- readline-4.3/doc/history.3 Thu Jan 31 16:11:05 2002
***************
*** 7,13 ****
.\" chet@ins.CWRU.Edu
.\"
! .\" Last Change: Tue Mar 6 12:50:54 EST 2001
.\"
! .TH HISTORY 3 "2001 Mar 6" "GNU History 4.2"
.\"
.\" File Name macro. This used to be `.PN', for Path Name,
--- 7,13 ----
.\" chet@ins.CWRU.Edu
.\"
! .\" Last Change: Thu Jan 31 16:08:07 EST 2002
.\"
! .TH HISTORY 3 "2002 January 31" "GNU History 4.3"
.\"
.\" File Name macro. This used to be `.PN', for Path Name,
***************
*** 41,46 ****
history \- GNU History Library
.SH COPYRIGHT
! .if t The GNU History Library is Copyright \(co 1989-2001 by the Free Software Foundation, Inc.
! .if n The GNU History Library is Copyright (C) 1989-2001 by the Free Software Foundation, Inc.
.SH DESCRIPTION
Many programs read input from the user a line at a time. The GNU
--- 41,46 ----
history \- GNU History Library
.SH COPYRIGHT
! .if t The GNU History Library is Copyright \(co 1989-2002 by the Free Software Foundation, Inc.
! .if n The GNU History Library is Copyright (C) 1989-2002 by the Free Software Foundation, Inc.
.SH DESCRIPTION
Many programs read input from the user a line at a time. The GNU
***************
*** 363,367 ****
.Fn1 int unstifle_history "void"
! Stop stifling the history. This returns the previous amount the
history was stifled. The value is positive if the history was
stifled, negative if it wasn't.
--- 363,368 ----
.Fn1 int unstifle_history "void"
! Stop stifling the history. This returns the previously-set
! maximum number of history entries (as set by \fBstifle_history()\fP).
history was stifled. The value is positive if the history was
stifled, negative if it wasn't.
Binary files readline-4.2a/doc/history.dvi and readline-4.3/doc/history.dvi differ
diff -Nrc2 readline-4.2a/doc/history.html readline-4.3/doc/history.html
*** readline-4.2a/doc/history.html Tue Oct 9 15:08:11 2001
--- readline-4.3/doc/history.html Thu Jun 27 13:54:41 2002
***************
*** 1,5 ****
!
!
beginning-of-line (C-a)
! -
Move to the start of the current line.
!
end-of-line (C-e)
! -
Move to the end of the line.
!
forward-char (C-f)
! -
Move forward a character.
!
backward-char (C-b)
! -
Move back a character.
!
forward-word (M-f)
! -
Move forward to the end of the next word. Words are composed of
letters and digits.
!
backward-word (M-b)
! -
Move back to the start of the current or previous word. Words are
composed of letters and digits.
!
clear-screen (C-l)
! -
Clear the screen and redraw the current line,
leaving the current line at the top of the screen.
!
redraw-current-line ()
! -
Refresh the current line. By default, this is unbound.
--- 1166,1217 ----
!
beginning-of-line (C-a)
! -
Move to the start of the current line.
!
end-of-line (C-e)
! -
Move to the end of the line.
!
forward-char (C-f)
! -
Move forward a character.
!
backward-char (C-b)
! -
Move back a character.
!
forward-word (M-f)
! -
Move forward to the end of the next word. Words are composed of
letters and digits.
!
backward-word (M-b)
! -
Move back to the start of the current or previous word. Words are
composed of letters and digits.
!
clear-screen (C-l)
! -
Clear the screen and redraw the current line,
leaving the current line at the top of the screen.
!
redraw-current-line ()
! -
Refresh the current line. By default, this is unbound.
***************
*** 1222,1228 ****
!
accept-line (Newline or Return)
! -
Accept the line regardless of where the cursor is.
If this line is
--- 1239,1245 ----
!
accept-line (Newline or Return)
! -
Accept the line regardless of where the cursor is.
If this line is
***************
*** 1233,1278 ****
!
previous-history (C-p)
! -
Move `back' through the history list, fetching the previous command.
!
next-history (C-n)
! -
Move `forward' through the history list, fetching the next command.
!
beginning-of-history (M-<)
! -
Move to the first line in the history.
!
end-of-history (M->)
! -
Move to the end of the input history, i.e., the line currently
being entered.
!
reverse-search-history (C-r)
! -
Search backward starting at the current line and moving `up' through
the history as necessary. This is an incremental search.
!
forward-search-history (C-s)
! -
Search forward starting at the current line and moving `down' through
the the history as necessary. This is an incremental search.
!
non-incremental-reverse-search-history (M-p)
! -
Search backward starting at the current line and moving `up'
through the history as necessary using a non-incremental search
--- 1250,1295 ----
!
previous-history (C-p)
! -
Move `back' through the history list, fetching the previous command.
!
next-history (C-n)
! -
Move `forward' through the history list, fetching the next command.
!
beginning-of-history (M-<)
! -
Move to the first line in the history.
!
end-of-history (M->)
! -
Move to the end of the input history, i.e., the line currently
being entered.
!
reverse-search-history (C-r)
! -
Search backward starting at the current line and moving `up' through
the history as necessary. This is an incremental search.
!
forward-search-history (C-s)
! -
Search forward starting at the current line and moving `down' through
the the history as necessary. This is an incremental search.
!
non-incremental-reverse-search-history (M-p)
! -
Search backward starting at the current line and moving `up'
through the history as necessary using a non-incremental search
***************
*** 1280,1286 ****
!
non-incremental-forward-search-history (M-n)
! -
Search forward starting at the current line and moving `down'
through the the history as necessary using a non-incremental search
--- 1297,1303 ----
!
non-incremental-forward-search-history (M-n)
! -
Search forward starting at the current line and moving `down'
through the the history as necessary using a non-incremental search
***************
*** 1288,1294 ****
!
history-search-forward ()
! -
Search forward through the history for the string of characters
between the start of the current line and the point.
--- 1305,1311 ----
!
history-search-forward ()
! -
Search forward through the history for the string of characters
between the start of the current line and the point.
***************
*** 1297,1303 ****
!
history-search-backward ()
! -
Search backward through the history for the string of characters
between the start of the current line and the point. This
--- 1314,1320 ----
!
history-search-backward ()
! -
Search backward through the history for the string of characters
between the start of the current line and the point. This
***************
*** 1305,1311 ****
!
yank-nth-arg (M-C-y)
! -
Insert the first argument to the previous command (usually
the second word on the previous line) at point.
--- 1322,1328 ----
!
yank-nth-arg (M-C-y)
! -
Insert the first argument to the previous command (usually
the second word on the previous line) at point.
***************
*** 1316,1322 ****
!
yank-last-arg (M-. or M-_)
! -
Insert last argument to the previous command (the last word of the
previous history entry). With an
--- 1333,1339 ----
!
yank-last-arg (M-. or M-_)
! -
Insert last argument to the previous command (the last word of the
previous history entry). With an
***************
*** 1348,1354 ****
!
delete-char (C-d)
! -
Delete the character at point. If point is at the
beginning of the line, there are no characters in the line, and
--- 1365,1371 ----
!
delete-char (C-d)
! -
Delete the character at point. If point is at the
beginning of the line, there are no characters in the line, and
***************
*** 1357,1370 ****
!
backward-delete-char (Rubout)
! -
Delete the character behind the cursor. A numeric argument means
to kill the characters instead of deleting them.
!
forward-backward-delete-char ()
! -
Delete the character under the cursor, unless the cursor is at the
end of the line, in which case the character behind the cursor is
--- 1374,1387 ----
!
backward-delete-char (Rubout)
! -
Delete the character behind the cursor. A numeric argument means
to kill the characters instead of deleting them.
!
forward-backward-delete-char ()
! -
Delete the character under the cursor, unless the cursor is at the
end of the line, in which case the character behind the cursor is
***************
*** 1372,1397 ****
!
quoted-insert (C-q or C-v)
! -
Add the next character typed to the line verbatim. This is
how to insert key sequences like C-q, for example.
!
tab-insert (M-TAB)
! -
Insert a tab character.
!
self-insert (a, b, A, 1, !, ...)
! -
Insert yourself.
!
transpose-chars (C-t)
! -
Drag the character before the cursor forward over
the character at the cursor, moving the
--- 1389,1414 ----
!
quoted-insert (C-q or C-v)
! -
Add the next character typed to the line verbatim. This is
how to insert key sequences like C-q, for example.
!
tab-insert (M-TAB)
! -
Insert a tab character.
!
self-insert (a, b, A, 1, !, ...)
! -
Insert yourself.
!
transpose-chars (C-t)
! -
Drag the character before the cursor forward over
the character at the cursor, moving the
***************
*** 1402,1408 ****
!
transpose-words (M-t)
! -
Drag the word before point past the word after point,
moving point past that word as well.
--- 1419,1425 ----
!
transpose-words (M-t)
! -
Drag the word before point past the word after point,
moving point past that word as well.
***************
*** 1411,1435 ****
!
upcase-word (M-u)
! -
Uppercase the current (or following) word. With a negative argument,
uppercase the previous word, but do not move the cursor.
!
downcase-word (M-l)
! -
Lowercase the current (or following) word. With a negative argument,
lowercase the previous word, but do not move the cursor.
!
capitalize-word (M-c)
! -
Capitalize the current (or following) word. With a negative argument,
capitalize the previous word, but do not move the cursor.
--- 1428,1471 ----
!
upcase-word (M-u)
! -
Uppercase the current (or following) word. With a negative argument,
uppercase the previous word, but do not move the cursor.
!
downcase-word (M-l)
! -
Lowercase the current (or following) word. With a negative argument,
lowercase the previous word, but do not move the cursor.
!
capitalize-word (M-c)
! -
Capitalize the current (or following) word. With a negative argument,
capitalize the previous word, but do not move the cursor.
+
+
overwrite-mode ()
+ -
+ Toggle overwrite mode. With an explicit positive numeric argument,
+ switches to overwrite mode. With an explicit non-positive numeric
+ argument, switches to insert mode. This command affects only
+
emacs
mode; vi
mode does overwrite differently.
+ Each call to readline()
starts in insert mode.
+
+
+ In overwrite mode, characters bound to self-insert
replace
+ the text at point rather than pushing the text to the right.
+ Characters bound to backward-delete-char
replace the character
+ before point with a space.
+
+
+ By default, this command is unbound.
+
+
***************
*** 1455,1486 ****
!
kill-line (C-k)
! -
Kill the text from point to the end of the line.
!
backward-kill-line (C-x Rubout)
! -
Kill backward to the beginning of the line.
!
unix-line-discard (C-u)
! -
Kill backward from the cursor to the beginning of the current line.
!
kill-whole-line ()
! -
Kill all characters on the current line, no matter where point is.
By default, this is unbound.
!
kill-word (M-d)
! -
Kill from point to the end of the current word, or if between
words, to the end of the next word.
--- 1491,1522 ----
!
kill-line (C-k)
! -
Kill the text from point to the end of the line.
!
backward-kill-line (C-x Rubout)
! -
Kill backward to the beginning of the line.
!
unix-line-discard (C-u)
! -
Kill backward from the cursor to the beginning of the current line.
!
kill-whole-line ()
! -
Kill all characters on the current line, no matter where point is.
By default, this is unbound.
!
kill-word (M-d)
! -
Kill from point to the end of the current word, or if between
words, to the end of the next word.
***************
*** 1488,1528 ****
!
backward-kill-word (M-DEL)
! -
Kill the word behind point.
Word boundaries are the same as
backward-word
.
!
unix-word-rubout (C-w)
! -
Kill the word behind point, using white space as a word boundary.
The killed text is saved on the kill-ring.
!
delete-horizontal-space ()
! -
Delete all spaces and tabs around point. By default, this is unbound.
!
kill-region ()
! -
Kill the text in the current region.
By default, this command is unbound.
!
copy-region-as-kill ()
! -
Copy the text in the region to the kill buffer, so it can be yanked
right away. By default, this command is unbound.
!
copy-backward-word ()
! -
Copy the word before point to the kill buffer.
The word boundaries are the same as
backward-word
.
--- 1524,1564 ----
!
backward-kill-word (M-DEL)
! -
Kill the word behind point.
Word boundaries are the same as
backward-word
.
!
unix-word-rubout (C-w)
! -
Kill the word behind point, using white space as a word boundary.
The killed text is saved on the kill-ring.
!
delete-horizontal-space ()
! -
Delete all spaces and tabs around point. By default, this is unbound.
!
kill-region ()
! -
Kill the text in the current region.
By default, this command is unbound.
!
copy-region-as-kill ()
! -
Copy the text in the region to the kill buffer, so it can be yanked
right away. By default, this command is unbound.
!
copy-backward-word ()
! -
Copy the word before point to the kill buffer.
The word boundaries are the same as
backward-word
.
***************
*** 1530,1536 ****
!
copy-forward-word ()
! -
Copy the word following point to the kill buffer.
The word boundaries are the same as
forward-word
.
--- 1566,1572 ----
!
copy-forward-word ()
! -
Copy the word following point to the kill buffer.
The word boundaries are the same as
forward-word
.
***************
*** 1538,1550 ****
!
yank (C-y)
! -
Yank the top of the kill ring into the buffer at point.
!
yank-pop (M-y)
! -
Rotate the kill-ring, and yank the new top. You can only do this if
the prior command is
yank
or yank-pop
.
--- 1574,1586 ----
!
yank (C-y)
! -
Yank the top of the kill ring into the buffer at point.
!
yank-pop (M-y)
! -
Rotate the kill-ring, and yank the new top. You can only do this if
the prior command is
yank
or yank-pop
.
***************
*** 1570,1583 ****
!
digit-argument (M-0, M-1, ... M--)
! -
Add this digit to the argument already accumulating, or start a new
argument. M-- starts a negative argument.
!
universal-argument ()
! -
This is another way to specify an argument.
If this command is followed by one or more digits, optionally with a
--- 1606,1619 ----
!
digit-argument (M-0, M-1, ... M--)
! -
Add this digit to the argument already accumulating, or start a new
argument. M-- starts a negative argument.
!
universal-argument ()
! -
This is another way to specify an argument.
If this command is followed by one or more digits, optionally with a
***************
*** 1614,1620 ****
!
complete (TAB)
! -
Attempt to perform completion on the text before point.
The actual completion performed is application-specific.
--- 1650,1656 ----
!
complete (TAB)
! -
Attempt to perform completion on the text before point.
The actual completion performed is application-specific.
***************
*** 1622,1641 ****
!
possible-completions (M-?)
! -
List the possible completions of the text before point.
!
insert-completions (M-*)
! -
Insert all completions of the text before point that would have
been generated by
possible-completions
.
!
menu-complete ()
! -
Similar to
complete
, but replaces the word to be completed
with a single match from the list of possible completions.
--- 1658,1677 ----
!
possible-completions (M-?)
! -
List the possible completions of the text before point.
!
insert-completions (M-*)
! -
Insert all completions of the text before point that would have
been generated by
possible-completions
.
!
menu-complete ()
! -
Similar to
complete
, but replaces the word to be completed
with a single match from the list of possible completions.
***************
*** 1652,1658 ****
!
delete-char-or-list ()
! -
Deletes the character under the cursor if not at the beginning or
end of the line (like
delete-char
).
--- 1688,1694 ----
!
delete-char-or-list ()
! -
Deletes the character under the cursor if not at the beginning or
end of the line (like
delete-char
).
***************
*** 1683,1702 ****
!
start-kbd-macro (C-x ()
! -
Begin saving the characters typed into the current keyboard macro.
!
end-kbd-macro (C-x ))
! -
Stop saving the characters typed into the current keyboard macro
and save the definition.
!
call-last-kbd-macro (C-x e)
! -
Re-execute the last keyboard macro defined, by making the characters
in the macro appear as if typed at the keyboard.
--- 1719,1738 ----
!
start-kbd-macro (C-x ()
! -
Begin saving the characters typed into the current keyboard macro.
!
end-kbd-macro (C-x ))
! -
Stop saving the characters typed into the current keyboard macro
and save the definition.
!
call-last-kbd-macro (C-x e)
! -
Re-execute the last keyboard macro defined, by making the characters
in the macro appear as if typed at the keyboard.
***************
*** 1724,1737 ****
!
re-read-init-file (C-x C-r)
! -
Read in the contents of the inputrc file, and incorporate
any bindings or variable assignments found there.
!
abort (C-g)
! -
Abort the current editing command and
ring the terminal's bell (subject to the setting of
--- 1760,1773 ----
!
re-read-init-file (C-x C-r)
! -
Read in the contents of the inputrc file, and incorporate
any bindings or variable assignments found there.
!
abort (C-g)
! -
Abort the current editing command and
ring the terminal's bell (subject to the setting of
***************
*** 1739,1752 ****
!
do-uppercase-version (M-a, M-b, M-x, ...)
! -
If the metafied character x is lowercase, run the command
that is bound to the corresponding uppercase character.
!
prefix-meta (ESC)
! -
Metafy the next character typed. This is for keyboards
without a meta key. Typing `ESC f' is equivalent to typing
--- 1775,1788 ----
!
do-uppercase-version (M-a, M-b, M-x, ...)
! -
If the metafied character x is lowercase, run the command
that is bound to the corresponding uppercase character.
!
prefix-meta (ESC)
! -
Metafy the next character typed. This is for keyboards
without a meta key. Typing `ESC f' is equivalent to typing
***************
*** 1754,1800 ****
!
undo (C-_ or C-x C-u)
! -
Incremental undo, separately remembered for each line.
!
revert-line (M-r)
! -
Undo all changes made to this line. This is like executing the
undo
command enough times to get back to the beginning.
!
tilde-expand (M-~)
! -
Perform tilde expansion on the current word.
!
set-mark (C-@)
! -
Set the mark to the point. If a
numeric argument is supplied, the mark is set to that position.
!
exchange-point-and-mark (C-x C-x)
! -
Swap the point with the mark. The current cursor position is set to
the saved position, and the old cursor position is saved as the mark.
!
character-search (C-])
! -
A character is read and point is moved to the next occurrence of that
character. A negative count searches for previous occurrences.
!
character-search-backward (M-C-])
! -
A character is read and point is moved to the previous occurrence
of that character. A negative count searches for subsequent
--- 1790,1836 ----
!
undo (C-_ or C-x C-u)
! -
Incremental undo, separately remembered for each line.
!
revert-line (M-r)
! -
Undo all changes made to this line. This is like executing the
undo
command enough times to get back to the beginning.
!
tilde-expand (M-~)
! -
Perform tilde expansion on the current word.
!
set-mark (C-@)
! -
Set the mark to the point. If a
numeric argument is supplied, the mark is set to that position.
!
exchange-point-and-mark (C-x C-x)
! -
Swap the point with the mark. The current cursor position is set to
the saved position, and the old cursor position is saved as the mark.
!
character-search (C-])
! -
A character is read and point is moved to the next occurrence of that
character. A negative count searches for previous occurrences.
!
character-search-backward (M-C-])
! -
A character is read and point is moved to the previous occurrence
of that character. A negative count searches for subsequent
***************
*** 1802,1816 ****
!
insert-comment (M-#)
! -
! The value of the
comment-begin
! variable is inserted at the beginning of the current line,
! and the line is accepted as if a newline had been typed.
!
dump-functions ()
! -
Print all of the functions and their key bindings to the
Readline output stream. If a numeric argument is supplied,
--- 1838,1857 ----
!
insert-comment (M-#)
! -
! Without a numeric argument, the value of the
comment-begin
! variable is inserted at the beginning of the current line.
! If a numeric argument is supplied, this command acts as a toggle: if
! the characters at the beginning of the line do not match the value
! of comment-begin
, the value is inserted, otherwise
! the characters in comment-begin
are deleted from the beginning of
! the line.
! In either case, the line is accepted as if a newline had been typed.
!
dump-functions ()
! -
Print all of the functions and their key bindings to the
Readline output stream. If a numeric argument is supplied,
***************
*** 1819,1825 ****
!
dump-variables ()
! -
Print all of the settable variables and their values to the
Readline output stream. If a numeric argument is supplied,
--- 1860,1866 ----
!
dump-variables ()
! -
Print all of the settable variables and their values to the
Readline output stream. If a numeric argument is supplied,
***************
*** 1828,1834 ****
!
dump-macros ()
! -
Print all of the Readline key sequences bound to macros and the
strings they output. If a numeric argument is supplied,
--- 1869,1875 ----
!
dump-macros ()
! -
Print all of the Readline key sequences bound to macros and the
strings they output. If a numeric argument is supplied,
***************
*** 1837,1840 ****
--- 1878,1895 ----
+
+
emacs-editing-mode (C-e)
+ -
+ When in
vi
command mode, this causes a switch to emacs
+ editing mode.
+
+
+
+
vi-editing-mode (M-C-j)
+ -
+ When in
emacs
editing mode, this causes a switch to vi
+ editing mode.
+
+
***************
*** 1883,1887 ****
! Copyright (C) 1988-2001 Free Software Foundation, Inc.
--- 1938,1942 ----
! Copyright (C) 1988-2002 Free Software Foundation, Inc.
***************
*** 1967,1972 ****
!
!
--- 2022,2027 ----
!
!
***************
*** 2014,2023 ****
static char *line_read = (char *)NULL;
! /* Read a string, and return a pointer to it. Returns NULL on EOF. */
char *
rl_gets ()
{
! /* If the buffer has already been allocated, return the memory
! to the free pool. */
if (line_read)
{
--- 2069,2079 ----
static char *line_read = (char *)NULL;
! /* Read a string, and return a pointer to it.
! Returns NULL on EOF. */
char *
rl_gets ()
{
! /* If the buffer has already been allocated,
! return the memory to the free pool. */
if (line_read)
{
***************
*** 2029,2033 ****
line_read = readline ("");
! /* If the line has any text in it, save it on the history. */
if (line_read && *line_read)
add_history (line_read);
--- 2085,2090 ----
line_read = readline ("");
! /* If the line has any text in it,
! save it on the history. */
if (line_read && *line_read)
add_history (line_read);
***************
*** 2237,2241 ****
!
--- 2294,2298 ----
!
| int foo (int count, int key)
|
***************
*** 2255,2258 ****
--- 2312,2319 ----
+ A command function should return 0 if its action completes successfully,
+ and a non-zero value if some error occurs.
+
+
***************
*** 2276,2280 ****
!
- Variable: char * rl_line_buffer
--- 2337,2341 ----
!
- Variable: char * rl_line_buffer
***************
*** 2286,2290 ****
!
- Variable: int rl_point
--- 2347,2351 ----
!
- Variable: int rl_point
***************
*** 2294,2298 ****
!
- Variable: int rl_end
--- 2355,2359 ----
!
- Variable: int rl_end
***************
*** 2303,2307 ****
!
- Variable: int rl_mark
--- 2364,2368 ----
!
- Variable: int rl_mark
***************
*** 2311,2315 ****
!
- Variable: int rl_done
--- 2372,2376 ----
!
- Variable: int rl_done
***************
*** 2319,2323 ****
!
- Variable: int rl_num_chars_to_read
--- 2380,2384 ----
!
- Variable: int rl_num_chars_to_read
***************
*** 2328,2332 ****
!
- Variable: int rl_pending_input
--- 2389,2393 ----
!
- Variable: int rl_pending_input
***************
*** 2336,2340 ****
!
- Variable: int rl_dispatching
--- 2397,2401 ----
!
- Variable: int rl_dispatching
***************
*** 2345,2349 ****
!
- Variable: int rl_erase_empty_line
--- 2406,2410 ----
!
- Variable: int rl_erase_empty_line
***************
*** 2355,2359 ****
!
- Variable: char * rl_prompt
--- 2416,2420 ----
!
- Variable: char * rl_prompt
***************
*** 2365,2369 ****
!
- Variable: int rl_already_prompted
--- 2426,2430 ----
!
- Variable: int rl_already_prompted
***************
*** 2378,2382 ****
!
- Variable: const char * rl_library_version
--- 2439,2443 ----
!
- Variable: const char * rl_library_version
***************
*** 2385,2389 ****
!
- Variable: int rl_readline_version
--- 2446,2450 ----
!
- Variable: int rl_readline_version
***************
*** 2396,2400 ****
!
- Variable: int rl_gnu_readline_p
--- 2457,2461 ----
!
- Variable: int rl_gnu_readline_p
***************
*** 2404,2408 ****
!
- Variable: const char * rl_terminal_name
--- 2465,2469 ----
!
- Variable: const char * rl_terminal_name
***************
*** 2413,2417 ****
!
- Variable: const char * rl_readline_name
--- 2474,2478 ----
!
- Variable: const char * rl_readline_name
***************
*** 2422,2440 ****
!
- Variable: FILE * rl_instream
- The stdio stream from which Readline reads input.
!
- Variable: FILE * rl_outstream
- The stdio stream to which Readline performs output.
!
- Variable: rl_command_func_t * rl_last_func
--- 2483,2503 ----
!
- Variable: FILE * rl_instream
- The stdio stream from which Readline reads input.
+ If
NULL
, Readline defaults to stdin.
!
- Variable: FILE * rl_outstream
- The stdio stream to which Readline performs output.
+ If
NULL
, Readline defaults to stdout.
!
- Variable: rl_command_func_t * rl_last_func
***************
*** 2445,2449 ****
!
- Variable: rl_hook_func_t * rl_startup_hook
--- 2508,2512 ----
!
- Variable: rl_hook_func_t * rl_startup_hook
***************
*** 2453,2457 ****
!
- Variable: rl_hook_func_t * rl_pre_input_hook
--- 2516,2520 ----
!
- Variable: rl_hook_func_t * rl_pre_input_hook
***************
*** 2462,2466 ****
!
- Variable: rl_hook_func_t * rl_event_hook
--- 2525,2529 ----
!
- Variable: rl_hook_func_t * rl_event_hook
***************
*** 2472,2476 ****
!
- Variable: rl_getc_func_t * rl_getc_function
--- 2535,2539 ----
!
- Variable: rl_getc_func_t * rl_getc_function
***************
*** 2482,2486 ****
!
- Variable: rl_voidfunc_t * rl_redisplay_function
--- 2545,2549 ----
!
- Variable: rl_voidfunc_t * rl_redisplay_function
***************
*** 2492,2496 ****
!
- Variable: rl_vintfunc_t * rl_prep_term_function
--- 2555,2559 ----
!
- Variable: rl_vintfunc_t * rl_prep_term_function
***************
*** 2503,2507 ****
!
- Variable: rl_voidfunc_t * rl_deprep_term_function
--- 2566,2570 ----
!
- Variable: rl_voidfunc_t * rl_deprep_term_function
***************
*** 2514,2518 ****
!
- Variable: Keymap rl_executing_keymap
--- 2577,2581 ----
!
- Variable: Keymap rl_executing_keymap
***************
*** 2522,2526 ****
!
- Variable: Keymap rl_binding_keymap
--- 2585,2589 ----
!
- Variable: Keymap rl_binding_keymap
***************
*** 2530,2534 ****
!
- Variable: char * rl_executing_macro
--- 2593,2597 ----
!
- Variable: char * rl_executing_macro
***************
*** 2537,2541 ****
!
- Variable: int rl_readline_state
--- 2600,2604 ----
!
- Variable: int rl_readline_state
***************
*** 2593,2597 ****
!
- Variable: int rl_explicit_arg
--- 2656,2660 ----
!
- Variable: int rl_explicit_arg
***************
*** 2601,2605 ****
!
- Variable: int rl_numeric_arg
--- 2664,2668 ----
!
- Variable: int rl_numeric_arg
***************
*** 2610,2614 ****
!
- Variable: int rl_editing_mode
--- 2673,2677 ----
!
- Variable: int rl_editing_mode
***************
*** 2688,2692 ****
!
- Function: int rl_add_defun (const char *name, rl_command_func_t *function, int key)
--- 2751,2755 ----
!
- Function: int rl_add_defun (const char *name, rl_command_func_t *function, int key)
***************
*** 2728,2732 ****
!
- Function: Keymap rl_make_bare_keymap (void)
--- 2791,2795 ----
!
- Function: Keymap rl_make_bare_keymap (void)
***************
*** 2737,2741 ****
!
- Function: Keymap rl_copy_keymap (Keymap map)
--- 2800,2804 ----
!
- Function: Keymap rl_copy_keymap (Keymap map)
***************
*** 2744,2748 ****
!
- Function: Keymap rl_make_keymap (void)
--- 2807,2811 ----
!
- Function: Keymap rl_make_keymap (void)
***************
*** 2753,2757 ****
!
- Function: void rl_discard_keymap (Keymap keymap)
--- 2816,2820 ----
!
- Function: void rl_discard_keymap (Keymap keymap)
***************
*** 2764,2768 ****
!
- Function: Keymap rl_get_keymap (void)
--- 2827,2831 ----
!
- Function: Keymap rl_get_keymap (void)
***************
*** 2771,2775 ****
!
- Function: void rl_set_keymap (Keymap keymap)
--- 2834,2838 ----
!
- Function: void rl_set_keymap (Keymap keymap)
***************
*** 2778,2782 ****
!
- Function: Keymap rl_get_keymap_by_name (const char *name)
--- 2841,2845 ----
!
- Function: Keymap rl_get_keymap_by_name (const char *name)
***************
*** 2786,2790 ****
!
- Function: char * rl_get_keymap_name (Keymap keymap)
--- 2849,2853 ----
!
- Function: char * rl_get_keymap_name (Keymap keymap)
***************
*** 2831,2835 ****
!
- Function: int rl_bind_key (int key, rl_command_func_t *function)
--- 2894,2898 ----
!
- Function: int rl_bind_key (int key, rl_command_func_t *function)
***************
*** 2839,2843 ****
!
- Function: int rl_bind_key_in_map (int key, rl_command_func_t *function, Keymap map)
--- 2902,2906 ----
!
- Function: int rl_bind_key_in_map (int key, rl_command_func_t *function, Keymap map)
***************
*** 2847,2851 ****
!
- Function: int rl_unbind_key (int key)
--- 2910,2914 ----
!
- Function: int rl_unbind_key (int key)
***************
*** 2855,2859 ****
!
- Function: int rl_unbind_key_in_map (int key, Keymap map)
--- 2918,2922 ----
!
- Function: int rl_unbind_key_in_map (int key, Keymap map)
***************
*** 2863,2867 ****
!
- Function: int rl_unbind_function_in_map (rl_command_func_t *function, Keymap map)
--- 2926,2930 ----
!
- Function: int rl_unbind_function_in_map (rl_command_func_t *function, Keymap map)
***************
*** 2870,2874 ****
!
- Function: int rl_unbind_command_in_map (const char *command, Keymap map)
--- 2933,2937 ----
!
- Function: int rl_unbind_command_in_map (const char *command, Keymap map)
***************
*** 2877,2881 ****
!
- Function: int rl_set_key (const char *keyseq, rl_command_func_t *function, Keymap map)
--- 2940,2944 ----
!
- Function: int rl_set_key (const char *keyseq, rl_command_func_t *function, Keymap map)
***************
*** 2886,2890 ****
!
- Function: int rl_generic_bind (int type, const char *keyseq, char *data, Keymap map)
--- 2949,2953 ----
!
- Function: int rl_generic_bind (int type, const char *keyseq, char *data, Keymap map)
***************
*** 2897,2901 ****
!
- Function: int rl_parse_and_bind (char *line)
--- 2960,2964 ----
!
- Function: int rl_parse_and_bind (char *line)
***************
*** 2906,2910 ****
!
- Function: int rl_read_init_file (const char *filename)
--- 2969,2973 ----
!
- Function: int rl_read_init_file (const char *filename)
***************
*** 2937,2941 ****
!
- Function: rl_command_func_t * rl_named_function (const char *name)
--- 3000,3004 ----
!
- Function: rl_command_func_t * rl_named_function (const char *name)
***************
*** 2944,2948 ****
!
- Function: rl_command_func_t * rl_function_of_keyseq (const char *keyseq, Keymap map, int *type)
--- 3007,3011 ----
!
- Function: rl_command_func_t * rl_function_of_keyseq (const char *keyseq, Keymap map, int *type)
***************
*** 2954,2958 ****
!
- Function: char ** rl_invoking_keyseqs (rl_command_func_t *function)
--- 3017,3021 ----
!
- Function: char ** rl_invoking_keyseqs (rl_command_func_t *function)
***************
*** 2962,2966 ****
!
- Function: char ** rl_invoking_keyseqs_in_map (rl_command_func_t *function, Keymap map)
--- 3025,3029 ----
!
- Function: char ** rl_invoking_keyseqs_in_map (rl_command_func_t *function, Keymap map)
***************
*** 2970,2974 ****
!
- Function: void rl_function_dumper (int readable)
--- 3033,3037 ----
!
- Function: void rl_function_dumper (int readable)
***************
*** 2980,2984 ****
!
- Function: void rl_list_funmap_names (void)
--- 3043,3047 ----
!
- Function: void rl_list_funmap_names (void)
***************
*** 2987,2991 ****
!
- Function: const char ** rl_funmap_names (void)
--- 3050,3054 ----
!
- Function: const char ** rl_funmap_names (void)
***************
*** 2996,3000 ****
!
- Function: int rl_add_funmap_entry (const char *name, rl_command_func_t *function)
--- 3059,3063 ----
!
- Function: int rl_add_funmap_entry (const char *name, rl_command_func_t *function)
***************
*** 3041,3046 ****
!
| enum undo_code { UNDO_DELETE, UNDO_INSERT, UNDO_BEGIN, UNDO_END };
! |
Notice that UNDO_DELETE
means to insert some text, and
--- 3104,3109 ----
!
| enum undo_code { UNDO_DELETE, UNDO_INSERT, UNDO_BEGIN, UNDO_END };
! |
Notice that UNDO_DELETE
means to insert some text, and
***************
*** 3051,3055 ****
!
- Function: int rl_begin_undo_group (void)
--- 3114,3118 ----
!
- Function: int rl_begin_undo_group (void)
***************
*** 3061,3065 ****
!
- Function: int rl_end_undo_group (void)
--- 3124,3128 ----
!
- Function: int rl_end_undo_group (void)
***************
*** 3070,3074 ****
!
- Function: void rl_add_undo (enum undo_code what, int start, int end, char *text)
--- 3133,3137 ----
!
- Function: void rl_add_undo (enum undo_code what, int start, int end, char *text)
***************
*** 3078,3082 ****
!
- Function: void rl_free_undo_list (void)
--- 3141,3145 ----
!
- Function: void rl_free_undo_list (void)
***************
*** 3085,3089 ****
!
- Function: int rl_do_undo (void)
--- 3148,3152 ----
!
- Function: int rl_do_undo (void)
***************
*** 3099,3103 ****
!
- Function: int rl_modifying (int start, int end)
--- 3162,3166 ----
!
- Function: int rl_modifying (int start, int end)
***************
*** 3126,3130 ****
!
- Function: void rl_redisplay (void)
--- 3189,3193 ----
!
- Function: void rl_redisplay (void)
***************
*** 3134,3138 ****
!
- Function: int rl_forced_update_display (void)
--- 3197,3201 ----
!
- Function: int rl_forced_update_display (void)
***************
*** 3142,3146 ****
!
- Function: int rl_on_new_line (void)
--- 3205,3209 ----
!
- Function: int rl_on_new_line (void)
***************
*** 3150,3154 ****
!
- Function: int rl_on_new_line_with_prompt (void)
--- 3213,3217 ----
!
- Function: int rl_on_new_line_with_prompt (void)
***************
*** 3162,3166 ****
!
- Function: int rl_reset_line_state (void)
--- 3225,3229 ----
!
- Function: int rl_reset_line_state (void)
***************
*** 3170,3174 ****
!
- Function: int rl_crlf (void)
--- 3233,3237 ----
!
- Function: int rl_crlf (void)
***************
*** 3177,3181 ****
!
- Function: int rl_show_char (int c)
--- 3240,3244 ----
!
- Function: int rl_show_char (int c)
***************
*** 3188,3192 ****
!
- Function: int rl_message (const char *, ...)
--- 3251,3255 ----
!
- Function: int rl_message (const char *, ...)
***************
*** 3199,3203 ****
!
- Function: int rl_clear_message (void)
--- 3262,3266 ----
!
- Function: int rl_clear_message (void)
***************
*** 3206,3210 ****
!
- Function: void rl_save_prompt (void)
--- 3269,3273 ----
!
- Function: void rl_save_prompt (void)
***************
*** 3214,3218 ****
!
- Function: void rl_restore_prompt (void)
--- 3277,3281 ----
!
- Function: void rl_restore_prompt (void)
***************
*** 3222,3226 ****
!
- Function: int rl_expand_prompt (char *prompt)
--- 3285,3289 ----
!
- Function: int rl_expand_prompt (char *prompt)
***************
*** 3235,3239 ****
!
- Function: int rl_set_prompt (const char *prompt)
--- 3298,3302 ----
!
- Function: int rl_set_prompt (const char *prompt)
***************
*** 3262,3280 ****
!
- Function: int rl_insert_text (const char *text)
- Insert text into the line at the current cursor position.
!
- Function: int rl_delete_text (int start, int end)
- Delete the text between start and end in the current line.
!
- Function: char * rl_copy_text (int start, int end)
--- 3325,3345 ----
!
- Function: int rl_insert_text (const char *text)
- Insert text into the line at the current cursor position.
+ Returns the number of characters inserted.
!
- Function: int rl_delete_text (int start, int end)
- Delete the text between start and end in the current line.
+ Returns the number of characters deleted.
!
- Function: char * rl_copy_text (int start, int end)
***************
*** 3284,3288 ****
!
- Function: int rl_kill_text (int start, int end)
--- 3349,3353 ----
!
- Function: int rl_kill_text (int start, int end)
***************
*** 3296,3300 ****
!
- Function: int rl_push_macro_input (char *macro)
--- 3361,3365 ----
!
- Function: int rl_push_macro_input (char *macro)
***************
*** 3323,3327 ****
!
- Function: int rl_read_key (void)
--- 3388,3392 ----
!
- Function: int rl_read_key (void)
***************
*** 3335,3339 ****
!
- Function: int rl_getc (FILE *stream)
--- 3400,3404 ----
!
- Function: int rl_getc (FILE *stream)
***************
*** 3343,3356 ****
!
- Function: int rl_stuff_char (int c)
- Insert c into the Readline input stream. It will be "read"
before Readline attempts to read characters from the terminal with
!
rl_read_key()
.
!
- Function: int rl_execute_next (int c)
--- 3408,3423 ----
!
- Function: int rl_stuff_char (int c)
- Insert c into the Readline input stream. It will be "read"
before Readline attempts to read characters from the terminal with
!
rl_read_key()
. Up to 512 characters may be pushed back.
! rl_stuff_char
returns 1 if the character was successfully inserted;
! 0 otherwise.
!
- Function: int rl_execute_next (int c)
***************
*** 3360,3364 ****
!
- Function: int rl_clear_pending_input (void)
--- 3427,3431 ----
!
- Function: int rl_clear_pending_input (void)
***************
*** 3369,3373 ****
!
- Function: int rl_set_keyboard_input_timeout (int u)
--- 3436,3440 ----
!
- Function: int rl_set_keyboard_input_timeout (int u)
***************
*** 3397,3401 ****
!
- Function: void rl_prep_terminal (int meta_flag)
--- 3464,3468 ----
!
- Function: void rl_prep_terminal (int meta_flag)
***************
*** 3407,3411 ****
!
- Function: void rl_deprep_terminal (void)
--- 3474,3478 ----
!
- Function: void rl_deprep_terminal (void)
***************
*** 3416,3420 ****
!
- Function: void rl_tty_set_default_bindings (Keymap kmap)
--- 3483,3487 ----
!
- Function: void rl_tty_set_default_bindings (Keymap kmap)
***************
*** 3425,3429 ****
!
- Function: int rl_reset_terminal (const char *terminal_name)
--- 3492,3496 ----
!
- Function: int rl_reset_terminal (const char *terminal_name)
***************
*** 3453,3457 ****
!
- Function: int rl_extend_line_buffer (int len)
--- 3520,3534 ----
!
!
! - Function: void rl_replace_line (const char *text, int clear_undo)
!
- Replace the contents of
rl_line_buffer
with text.
! The point and mark are preserved, if possible.
! If clear_undo is non-zero, the undo list associated with the
! current line is cleared.
!
!
!
!
- Function: int rl_extend_line_buffer (int len)
***************
*** 3461,3465 ****
!
- Function: int rl_initialize (void)
--- 3538,3542 ----
!
- Function: int rl_initialize (void)
***************
*** 3470,3474 ****
!
- Function: int rl_ding (void)
--- 3547,3551 ----
!
- Function: int rl_ding (void)
***************
*** 3477,3481 ****
!
- Function: int rl_alphabetic (int c)
--- 3554,3558 ----
!
- Function: int rl_alphabetic (int c)
***************
*** 3484,3488 ****
!
- Function: void rl_display_match_list (char **matches, int len, int max)
--- 3561,3565 ----
!
- Function: void rl_display_match_list (char **matches, int len, int max)
***************
*** 3501,3505 ****
!
- Function: int _rl_uppercase_p (int c)
--- 3578,3582 ----
!
- Function: int _rl_uppercase_p (int c)
***************
*** 3508,3512 ****
!
- Function: int _rl_lowercase_p (int c)
--- 3585,3589 ----
!
- Function: int _rl_lowercase_p (int c)
***************
*** 3515,3519 ****
!
- Function: int _rl_digit_p (int c)
--- 3592,3596 ----
!
- Function: int _rl_digit_p (int c)
***************
*** 3522,3526 ****
!
- Function: int _rl_to_upper (int c)
--- 3599,3603 ----
!
- Function: int _rl_to_upper (int c)
***************
*** 3530,3534 ****
!
- Function: int _rl_to_lower (int c)
--- 3607,3611 ----
!
- Function: int _rl_to_lower (int c)
***************
*** 3538,3542 ****
!
- Function: int _rl_digit_value (int c)
--- 3615,3619 ----
!
- Function: int _rl_digit_value (int c)
***************
*** 3563,3567 ****
!
- Function: int rl_macro_bind (const char *keyseq, const char *macro, Keymap map)
--- 3640,3644 ----
!
- Function: int rl_macro_bind (const char *keyseq, const char *macro, Keymap map)
***************
*** 3573,3577 ****
!
- Function: void rl_macro_dumper (int readable)
--- 3650,3654 ----
!
- Function: void rl_macro_dumper (int readable)
***************
*** 3583,3587 ****
!
- Function: int rl_variable_bind (const char *variable, const char *value)
--- 3660,3664 ----
!
- Function: int rl_variable_bind (const char *variable, const char *value)
***************
*** 3593,3597 ****
!
- Function: void rl_variable_dumper (int readable)
--- 3670,3674 ----
!
- Function: void rl_variable_dumper (int readable)
***************
*** 3603,3607 ****
!
- Function: int rl_set_paren_blink_timeout (int u)
--- 3680,3684 ----
!
- Function: int rl_set_paren_blink_timeout (int u)
***************
*** 3611,3615 ****
!
- Function: char * rl_get_termcap (const char *cap)
--- 3688,3692 ----
!
- Function: char * rl_get_termcap (const char *cap)
***************
*** 3649,3653 ****
!
- Function: void rl_callback_handler_install (const char *prompt, rl_vcpfunc_t *lhandler)
--- 3726,3730 ----
!
- Function: void rl_callback_handler_install (const char *prompt, rl_vcpfunc_t *lhandler)
***************
*** 3659,3680 ****
!
- Function: void rl_callback_read_char (void)
- Whenever an application determines that keyboard input is available, it
should call
rl_callback_read_char()
, which will read the next
! character from the current input source. If that character completes the
! line, rl_callback_read_char
will invoke the lhandler
! function saved by rl_callback_handler_install
to process the
! line. EOF
is indicated by calling lhandler with a
NULL
line.
!
- Function: void rl_callback_handler_remove (void)
- Restore the terminal to its initial state and remove the line handler.
This may be called from within a callback as well as independently.
--- 3736,3767 ----
!
- Function: void rl_callback_read_char (void)
- Whenever an application determines that keyboard input is available, it
should call
rl_callback_read_char()
, which will read the next
! character from the current input source.
! If that character completes the line, rl_callback_read_char
will
! invoke the lhandler function saved by rl_callback_handler_install
! to process the line.
! Before calling the lhandler function, the terminal settings are
! reset to the values they had before calling
! rl_callback_handler_install
.
! If the lhandler function returns,
! the terminal settings are modified for Readline's use again.
! EOF
is indicated by calling lhandler with a
NULL
line.
!
- Function: void rl_callback_handler_remove (void)
- Restore the terminal to its initial state and remove the line handler.
This may be called from within a callback as well as independently.
+ If the lhandler installed by
rl_callback_handler_install
+ does not exit the program, either this function or the function referred
+ to by the value of rl_deprep_term_function
should be called before
+ the program exits to reset the terminal settings.
***************
*** 3745,3750 ****
}
! /* Tell readline that we are modifying the line, so it will save
! the undo information. */
rl_modifying (start, end);
--- 3832,3837 ----
}
! /* Tell readline that we are modifying the line,
! so it will save the undo information. */
rl_modifying (start, end);
***************
*** 3826,3830 ****
!
- Variable: int rl_catch_signals
--- 3913,3917 ----
!
- Variable: int rl_catch_signals
***************
*** 3838,3842 ****
!
- Variable: int rl_catch_sigwinch
--- 3925,3929 ----
!
- Variable: int rl_catch_sigwinch
***************
*** 3856,3860 ****
!
- Function: void rl_cleanup_after_signal (void)
--- 3943,3947 ----
!
- Function: void rl_cleanup_after_signal (void)
***************
*** 3866,3870 ****
!
- Function: void rl_free_line_state (void)
--- 3953,3957 ----
!
- Function: void rl_free_line_state (void)
***************
*** 3878,3882 ****
!
- Function: void rl_reset_after_signal (void)
--- 3965,3969 ----
!
- Function: void rl_reset_after_signal (void)
***************
*** 3893,3897 ****
!
- Function: void rl_resize_terminal (void)
--- 3980,3984 ----
!
- Function: void rl_resize_terminal (void)
***************
*** 3900,3904 ****
!
- Function: void rl_set_screen_size (int rows, int cols)
--- 3987,3991 ----
!
- Function: void rl_set_screen_size (int rows, int cols)
***************
*** 3913,3917 ****
!
- Function: void rl_get_screen_size (int *rows, int *cols)
--- 4000,4004 ----
!
- Function: void rl_get_screen_size (int *rows, int *cols)
***************
*** 3924,3928 ****
!
- Function: int rl_set_signals (void)
--- 4011,4015 ----
!
- Function: int rl_set_signals (void)
***************
*** 3934,3938 ****
!
- Function: int rl_clear_signals (void)
--- 4021,4025 ----
!
- Function: int rl_clear_signals (void)
***************
*** 4045,4049 ****
!
- Function: int rl_complete (int ignore, int invoking_key)
--- 4132,4136 ----
!
- Function: int rl_complete (int ignore, int invoking_key)
***************
*** 4054,4058 ****
!
- Variable: rl_compentry_func_t * rl_completion_entry_function
--- 4141,4145 ----
!
- Variable: rl_compentry_func_t * rl_completion_entry_function
***************
*** 4087,4091 ****
!
- Function: int rl_complete_internal (int what_to_do)
--- 4174,4178 ----
!
- Function: int rl_complete_internal (int what_to_do)
***************
*** 4099,4103 ****
!
- Function: int rl_complete (int ignore, int invoking_key)
--- 4186,4190 ----
!
- Function: int rl_complete (int ignore, int invoking_key)
***************
*** 4111,4115 ****
!
- Function: int rl_possible_completions (int count, int invoking_key)
--- 4198,4202 ----
!
- Function: int rl_possible_completions (int count, int invoking_key)
***************
*** 4120,4124 ****
!
- Function: int rl_insert_completions (int count, int invoking_key)
--- 4207,4211 ----
!
- Function: int rl_insert_completions (int count, int invoking_key)
***************
*** 4129,4133 ****
!
- Function: char ** rl_completion_matches (const char *text, rl_compentry_func_t *entry_func)
--- 4216,4231 ----
!
!
! - Function: int rl_completion_mode (rl_command_func_t *cfunc)
!
- Returns the apppriate value to pass to
rl_complete_internal()
! depending on whether cfunc was called twice in succession and
! the value of the show-all-if-ambiguous
variable.
! Application-specific completion functions may use this function to present
! the same interface as rl_complete()
.
!
!
!
!
- Function: char ** rl_completion_matches (const char *text, rl_compentry_func_t *entry_func)
***************
*** 4147,4151 ****
!
- Function: char * rl_filename_completion_function (const char *text, int state)
--- 4245,4249 ----
!
- Function: char * rl_filename_completion_function (const char *text, int state)
***************
*** 4158,4162 ****
!
- Function: char * rl_username_completion_function (const char *text, int state)
--- 4256,4260 ----
!