touched all sources to ease import of readline-5.1

diff --git a/readline/ChangeLog.gdb b/readline/ChangeLog.gdb
index 863beca4441a2869280de45b1a2a5e12bddfd9a3..e95619318eae21a54e4955d0ef13b133e50225e1 100644 (file)
--- a/readline/ChangeLog.gdb
+++ b/readline/ChangeLog.gdb
@@ -266,12 +266,17 @@
        (insert_some_chars) [__MSDOS__]: Don't call tputs.
        (delete_chars) [__MSDOS__]: Don't call tputs.
 
-2000-07-09  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
+2000-07-08  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
+
+        * readline/readline.h: Ifdef out the export of savestring().
+        It should not have been in the distribution.
+
+2000-07-07  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
 
         * Import of readline 4.1.
 
         Locally modified files: Makefile.in, configure.in, configure
-        (regenerated), config.h.in (regenerated), readline.h, rltty.c,
+        (regenerated), config.h.in (regenerated), rltty.c,
        shell.c signals.c.
 
         Locally added files: acconfig.h, config/*, config.h.bot,

diff --git a/readline/configure b/readline/configure
index b9cedcd4a717500bb395e457b3d425bd766043e6..720d789bae0181cb5b6ecb4b1f5482820ab9cf4f 100755 (executable)
--- a/readline/configure
+++ b/readline/configure
@@ -849,6 +849,10 @@ if test -n "$ac_init_help"; then
 Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+<<<<<<< configure
+  --enable-shared         build shared libraries [default=NO]
+=======
+>>>>>>> 1.6
   --enable-static         build static libraries [default=YES]
 
 Optional Packages:

diff --git a/readline/doc/ChangeLog.gdb b/readline/doc/ChangeLog.gdb
index 854d3ee8f2a5b83a56e5084ee7cf2428b44a5877..1253d9c4aed0024b7832312ab6ddd966354e0e96 100644 (file)
--- a/readline/doc/ChangeLog.gdb
+++ b/readline/doc/ChangeLog.gdb
@@ -13,6 +13,10 @@
 
 2000-07-09  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
 
+        * Removed generated files rluserman.{dvi, info, html, ps}.
+
+2000-07-07  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
+
         * Import of readline 4.1.
 
         Regenerated inc-hist.texinfo as copy of hsuser.texinfo, for