merge with 1.8b

diff --git a/lib/regex.c b/lib/regex.c
index 15ca91bc54a29b81a91d415d880a8d017c08a0ef..8b7aecf0d80912e568f7a12d81897b45e3af585c 100644 (file)
--- a/lib/regex.c
+++ b/lib/regex.c
@@ -26,6 +26,17 @@
 
 #define _GNU_SOURCE
 
+#ifdef HAVE_CONFIG_H
+#if defined (CONFIG_BROKETS)
+/* We use <config.h> instead of "config.h" so that a compilation
+   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
+   (which it would do because it found this file in $srcdir).  */
+#include <config.h>
+#else
+#include "config.h"
+#endif
+#endif
+
 /* We need this for `regex.h', and perhaps for the Emacs include files.  */
 #include <sys/types.h>
 

diff --git a/old/textutils/ChangeLog b/old/textutils/ChangeLog
index 49d83509233fcd46cf45ee0f840f4be22fb548bc..4de3941a05e3ae4f49eafc78ce212274e90be20c 100644 (file)
--- a/old/textutils/ChangeLog
+++ b/old/textutils/ChangeLog
@@ -1,3 +1,12 @@
+Tue Oct 12 00:53:26 1993  Jim Meyering  (meyering@comco.com)
+
+       * xwrite.c [HAVE_CONFIG_H, CONFIG_BROKETS]: Include <config.h>
+       or "config.h".
+
+Sat Oct 09 23:37:43 1993  Jim Meyering  (meyering@comco.com)
+
+       * configure.in: Remove AC_UNISTD_H; add unistd.h to AC_HAVE_HEADERS.
+
 Thu Sep  9 21:52:10 1993  Jim Meyering  (meyering@comco.com)
 
        * src/*.c: Print version on standard output, not stderr.