merge with 1.8d

23 files changed, 253 insertions, 0 deletions

diff --git a/lib/memchr.c b/lib/memchr.c
index 749510636..bb8b81381 100644
--- a/lib/memchr.c
+++ b/lib/memchr.c
@@ -20,6 +20,17 @@ License along with the GNU C Library; see the file COPYING.LIB.  If
 not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.  */
 
+#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
+
 /* Search no more than N bytes of S for C.  */
 
 char *
diff --git a/src/cat.c b/src/cat.c
index 70d1c6854..8cbc61f7d 100644
--- a/src/cat.c
+++ b/src/cat.c
@@ -22,6 +22,17 @@
 
    By tege@sics.se, Torbjorn Granlund, advised by rms, Richard Stallman. */
 
+#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
+
 #include <stdio.h>
 #include <getopt.h>
 #include <sys/types.h>
diff --git a/src/cksum.c b/src/cksum.c
index a3dd81dfe..f6f7d26a3 100644
--- a/src/cksum.c
+++ b/src/cksum.c
@@ -40,6 +40,17 @@
   except foreign language interface (4.9.5.3 of P1003.2/D11.2) support.
   Any inconsistency with the standard except 4.9.5.3 is a bug.  */
 
+#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
+
 #ifdef CRCTAB
 
 #include <stdio.h>
diff --git a/src/comm.c b/src/comm.c
index d79ca7bbf..1900661cd 100644
--- a/src/comm.c
+++ b/src/comm.c
@@ -17,6 +17,17 @@
 
 /* Written by Richard Stallman and David MacKenzie. */
 
+#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
+
 #include <stdio.h>
 #include <getopt.h>
 #include <sys/types.h>
diff --git a/src/csplit.c b/src/csplit.c
index f2beb0fc0..4fb9f2ca5 100644
--- a/src/csplit.c
+++ b/src/csplit.c
@@ -18,6 +18,17 @@
 /* Written by Stuart Kemp, cpsrk@groper.jcu.edu.au.
    Modified by David MacKenzie, djm@gnu.ai.mit.edu. */
 
+#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
+
 #include <stdio.h>
 #include <getopt.h>
 #include <sys/types.h>
diff --git a/src/cut.c b/src/cut.c
index 9a056c75c..4953afc04 100644
--- a/src/cut.c
+++ b/src/cut.c
@@ -57,6 +57,17 @@
 
    A FILE of `-' means standard input. */
 
+#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
+
 /* Get isblank from GNU libc.  */
 #define _GNU_SOURCE
 
diff --git a/src/expand.c b/src/expand.c
index 7acf5fd09..92e8c61b7 100644
--- a/src/expand.c
+++ b/src/expand.c
@@ -33,6 +33,17 @@
 
    David MacKenzie <djm@gnu.ai.mit.edu> */
 
+#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
+
 /* Get isblank from GNU libc.  */
 #define _GNU_SOURCE
 
diff --git a/src/fold.c b/src/fold.c
index 80fa04711..39097c724 100644
--- a/src/fold.c
+++ b/src/fold.c
@@ -17,6 +17,17 @@
 
 /* Written by David MacKenzie, djm@gnu.ai.mit.edu. */
 
+#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
+
 /* Get isblank from GNU libc.  */
 #define _GNU_SOURCE
 
diff --git a/src/head.c b/src/head.c
index 5c34f6a3e..82ad29141 100644
--- a/src/head.c
+++ b/src/head.c
@@ -33,6 +33,17 @@
 
    David MacKenzie <djm@gnu.ai.mit.edu> */
 
+#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
+
 #include <stdio.h>
 #include <getopt.h>
 #include <sys/types.h>
diff --git a/src/join.c b/src/join.c
index cd9ea211c..0113f86c4 100644
--- a/src/join.c
+++ b/src/join.c
@@ -17,6 +17,17 @@
 
    Written by Mike Haertel, mike@gnu.ai.mit.edu. */
 
+#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
+
 /* Get isblank from GNU libc.  */
 #define _GNU_SOURCE
 
diff --git a/src/nl.c b/src/nl.c
index c91f11782..8fb0cd809 100644
--- a/src/nl.c
+++ b/src/nl.c
@@ -18,6 +18,17 @@
 /* Written by Scott Bartram (nancy!scott@uunet.uu.net)
    Revised by David MacKenzie (djm@gnu.ai.mit.edu) */
 
+#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
+
 #include <stdio.h>
 #include <sys/types.h>
 #include <getopt.h>
diff --git a/src/od.c b/src/od.c
index 698630071..c5c853bc8 100644
--- a/src/od.c
+++ b/src/od.c
@@ -18,6 +18,17 @@
 /* Written by Jim Meyering.  */
 
 /* AIX requires this to be the first thing in the file.  */
+#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
+
 #ifdef __GNUC__
 #define alloca __builtin_alloca
 #else /* not __GNUC__ */
diff --git a/src/paste.c b/src/paste.c
index 24c617db5..d4a0f9295 100644
--- a/src/paste.c
+++ b/src/paste.c
@@ -38,6 +38,17 @@
    A FILE of `-' means standard input.
    If no FILEs are given, standard input is used. */
 
+#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
+
 #include <stdio.h>
 #include <getopt.h>
 #include <sys/types.h>
diff --git a/src/pr.c b/src/pr.c
index 3451fa38b..9ac5a99d2 100644
--- a/src/pr.c
+++ b/src/pr.c
@@ -94,6 +94,17 @@
    -w width	Set the page width to WIDTH characters. */
 
 
+#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
+
 #include <stdio.h>
 #include <getopt.h>
 #include <sys/types.h>
diff --git a/src/sort.c b/src/sort.c
index 42e0b8e61..5253f5f89 100644
--- a/src/sort.c
+++ b/src/sort.c
@@ -19,6 +19,17 @@
    The author may be reached (Email) at the address mike@gnu.ai.mit.edu,
    or (US mail) as Mike Haertel c/o Free Software Foundation. */
 
+#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
+
 /* Get isblank from GNU libc.  */
 #define _GNU_SOURCE
 
diff --git a/src/split.c b/src/split.c
index b9aba0483..8dee177dd 100644
--- a/src/split.c
+++ b/src/split.c
@@ -21,6 +21,17 @@
    * Implement -t CHAR or -t REGEX to specify break characters other
      than newline. */
 
+#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
+
 #include <stdio.h>
 #include <getopt.h>
 #include <sys/types.h>
diff --git a/src/sum.c b/src/sum.c
index c625f7d95..3cf17662c 100644
--- a/src/sum.c
+++ b/src/sum.c
@@ -19,6 +19,17 @@
 
 /* Written by Kayvan Aghaiepour and David MacKenzie. */
 
+#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
+
 #include <stdio.h>
 #include <sys/types.h>
 #include <getopt.h>
diff --git a/src/tac.c b/src/tac.c
index d6671e214..34aa7e051 100644
--- a/src/tac.c
+++ b/src/tac.c
@@ -35,6 +35,17 @@
 tac -r -s '.\|
 ' file */
 
+#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
+
 #include <stdio.h>
 #include <getopt.h>
 #include <sys/types.h>
diff --git a/src/tail.c b/src/tail.c
index c6f0206b1..e5308a15c 100644
--- a/src/tail.c
+++ b/src/tail.c
@@ -45,6 +45,17 @@
    Extensions by David MacKenzie <djm@gnu.ai.mit.edu>.
    tail -f for multiple files by Ian Lance Taylor <ian@airs.com>.  */
 
+#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
+
 #include <stdio.h>
 #include <getopt.h>
 #include <sys/types.h>
diff --git a/src/tr.c b/src/tr.c
index f6c11b953..aadab06cb 100644
--- a/src/tr.c
+++ b/src/tr.c
@@ -17,6 +17,17 @@
 
 /* Written by Jim Meyering, meyering@cs.utexas.edu. */
 
+#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
+
 /* Get isblank from GNU libc.  */
 #define _GNU_SOURCE
 
diff --git a/src/unexpand.c b/src/unexpand.c
index 7affd88b5..5ab1e6bbb 100644
--- a/src/unexpand.c
+++ b/src/unexpand.c
@@ -35,6 +35,17 @@
 
    David MacKenzie <djm@gnu.ai.mit.edu> */
 
+#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
+
 /* Get isblank from GNU libc.  */
 #define _GNU_SOURCE
 
diff --git a/src/uniq.c b/src/uniq.c
index 9323397ba..6ba6b6869 100644
--- a/src/uniq.c
+++ b/src/uniq.c
@@ -17,6 +17,17 @@
 
 /* Written by Richard Stallman and David MacKenzie. */
 
+#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
+
 /* Get isblank from GNU libc.  */
 #define _GNU_SOURCE
 
diff --git a/src/wc.c b/src/wc.c
index 6e67ecb9b..6dce78241 100644
--- a/src/wc.c
+++ b/src/wc.c
@@ -18,6 +18,17 @@
 /* Written by Paul Rubin, phr@ocf.berkeley.edu
    and David MacKenzie, djm@gnu.ai.mit.edu. */
 
+#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
+
 #include <stdio.h>
 #include <getopt.h>
 #include <sys/types.h>