summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>1993-10-17 02:57:45 +0000
committerJim Meyering <jim@meyering.net>1993-10-17 02:57:45 +0000
commit6e1a4cca6862fa1fb40b4c38b73fa30ebb61344b (patch)
treedc3b05eca5eb29fb5d2400305751bfcdf175f033
parentc2b140693b2ded35ed4453c0ec188c6aa0ad3e7c (diff)
downloadcoreutils-6e1a4cca6862fa1fb40b4c38b73fa30ebb61344b.tar.xz
merge with 1.8b
-rw-r--r--lib/regex.c11
-rw-r--r--old/textutils/ChangeLog9
2 files changed, 20 insertions, 0 deletions
diff --git a/lib/regex.c b/lib/regex.c
index 15ca91bc5..8b7aecf0d 100644
--- 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 49d835092..4de3941a0 100644
--- 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.