1998-12-24 Jason Molenda (jsm@bugshack.cygnus.com)

* Makefile.in: Add CYGNUS LOCAL comment.
        * acconfig.h: Add missing defines.
        * config.h.bot: Add missing content.
        * configure, config.h.in: Regenerated.

config.h.in is a generated file, but the readline distribution
checked in could not regenerate this.  This set of changes fixes
that.

readline/.Sanitize

@@ -39,6 +39,7 @@ bind.c
 callback.c
 chardefs.h
 complete.c
+config.h.bot
 config.h.in
 configure
 configure.in

readline/ChangeLog

@@ -1,3 +1,10 @@
+1998-12-24  Jason Molenda  (jsm@bugshack.cygnus.com)
+
+	* Makefile.in: Add CYGNUS LOCAL comment.
+	* acconfig.h: Add missing defines.
+	* config.h.bot: Add missing content.
+	* configure, config.h.in: Regenerated.
+
 Wed Dec 23 16:21:41 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
 
 	* Makefile.in: comment out the rule to rebuild configure by 

readline/Makefile.in

@@ -183,6 +183,7 @@ stamp-h: config.status $(srcdir)/config.h.in
 	CONFIG_FILES= CONFIG_HEADERS=config.h ./config.status
 	echo > $@
 
+# CYGNUS LOCAL: Never run autoconf.
 #$(srcdir)/configure: $(srcdir)/configure.in	 Comment-me-out in distribution
 #	cd $(srcdir) && autoconf	 Comment-me-out in distribution
 

readline/acconfig.h

@@ -23,6 +23,32 @@
 
 #undef HAVE_GETPW_DECLS
 
+#undef FIONREAD_IN_SYS_IOCTL
+
+#undef HAVE_BSD_SIGNALS
+
+#undef HAVE_LSTAT
+
+#undef HAVE_POSIX_SIGNALS
+
+#undef HAVE_POSIX_SIGSETJMP
+
+#undef HAVE_USG_SIGHOLD
+
+#undef MUST_REINSTALL_SIGHANDLERS
+
+#undef SPEED_T_IN_SYS_TYPES
+
+#undef STRCOLL_BROKEN
+
+#undef STRUCT_DIRENT_HAS_D_FILENO
+
+#undef STRUCT_DIRENT_HAS_D_INO
+
+#undef STRUCT_WINSIZE_IN_SYS_IOCTL
+
+#undef STRUCT_WINSIZE_IN_TERMIOS
+
 
 /* Leave that blank line there!!  Autoheader needs it.
    If you're adding to this file, keep in mind:

readline/config.h.bot

@@ -0,0 +1,22 @@
+/* config.h.bot */
+/* modify settings or make new ones based on what autoconf tells us. */
+
+/* Ultrix botches type-ahead when switching from canonical to
+   non-canonical mode, at least through version 4.3 */
+#if !defined (HAVE_TERMIOS_H) || !defined (HAVE_TCGETATTR) || defined (ultrix)
+#  define TERMIOS_MISSING
+#endif
+
+#if defined (STRCOLL_BROKEN)
+#  undef HAVE_STRCOLL
+#endif
+
+#if defined (__STDC__) && defined (HAVE_STDARG_H)
+#  define PREFER_STDARG
+#  define USE_VARARGS
+#else
+#  if defined (HAVE_VARARGS_H)
+#    define PREFER_VARARGS
+#    define USE_VARARGS
+#  endif
+#endif