merge with 1.8d

diff --git a/lib/memchr.c b/lib/memchr.c
index 74951063629be982e38b555be63f9d951f1fada2..bb8b81381700a3cb60417465dd3dd83cda0d032b 100644 (file)
--- 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 70d1c685481bd46fe0620c298ebfcab7943a41c1..8cbc61f7d0414e241a35354814b2ba965519a558 100644 (file)
--- 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 a3dd81dfe430bffc4541aadfc2ecf2e2298afb2a..f6f7d26a3dcb5829f60cd8a90e7ba170983b244e 100644 (file)
--- 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 d79ca7bbff3dfed94dcd3aafe76181d10f7c7c1d..1900661cda6ea6b339786447bed5a8cbb5675f8f 100644 (file)
--- a/src/comm.c
+++ b/src/comm.c
@@ -17,6 +17,17 @@
 
 /* Written by Richard Stallman and David MacKenzie. */
 \f
+#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 f2beb0fc0d663ef14b95a6230a3fdf6d24717052..4fb9f2ca52007b0ea20b4afd530c03bae5c05e84 100644 (file)
--- 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 9a056c75c41538065fc0abe52c99cecf907af01f..4953afc045415175408c1fa3b51ed68360c33647 100644 (file)
--- 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 7acf5fd09ca066710fe09cfb9db932eec9250328..92e8c61b71014303a1ed07da94111b325b4766ed 100644 (file)
--- 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 80fa04711b6882548decb00883c080c6c418f771..39097c7248d601e90b6a575b57c879592dadb1ca 100644 (file)
--- 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 5c34f6a3e2830606a1341f236dd1b3c529aaaf91..82ad291410ef0789249116a190c40754e2f4816c 100644 (file)
--- 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 cd9ea211c95915609bf66998f2efbbe1feb3eda5..0113f86c4dc8f333cf64286cfc684a7fe0fbd652 100644 (file)
--- 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 c91f11782abc25767c2af6b69b069caac3773327..8fb0cd80912b661bc534fe2429b236bb95dc11ee 100644 (file)
--- 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 698630071bacf31c3ffbc3768fa937fafedadd7d..c5c853bc868281c9ee02e789e2e5195b9c238c34 100644 (file)
--- 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 24c617db534d6bbe1e7bef6c0c1ecdbec8918a62..d4a0f92953f305bb1a506b11a83593ea5bd58b97 100644 (file)
--- 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 3451fa38b634d248305d0358670c5268382540f1..9ac5a99d22e880b3c151a1ed8215bf3c0d3c2201 100644 (file)
--- a/src/pr.c
+++ b/src/pr.c
@@ -94,6 +94,17 @@
    -w width    Set the page width to WIDTH characters. */
 \f
 
+#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 42e0b8e6117767ddb9894115f3dbe41bc470cfbb..5253f5f892b185c2abb5328a53472d2be57e2787 100644 (file)
--- 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 b9aba04834009367cf69dfa9c06fecc53c527d37..8dee177dda6805abea6a7ffdc842ad69f51a838b 100644 (file)
--- 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 c625f7d955f071a8c79c736b03617dacd594a2c2..3cf17662c4b41bb59be510ff469a6793b1a22e16 100644 (file)
--- 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 d6671e21468741574b022df788727033be141df5..34aa7e0510c666ea34efb45eda850d9d43229348 100644 (file)
--- 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 c6f0206b14d52500a28817ed4449631639cbf60e..e5308a15c0d57fe14d2990be9d21c5c691424661 100644 (file)
--- 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 f6c11b9530f3150f0b4268917ed97eb4f08cd7f9..aadab06cbcd3c6322e090ad1260432f4c533d2de 100644 (file)
--- 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 7affd88b5e8655ddb75b5449b79985e4803a2553..5ab1e6bbb78418c6af196e598b76a7e45c4c7d90 100644 (file)
--- 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 9323397ba061cf3162eca970205edb8d0a7b9f5f..6ba6b6869c1ccb027e7a495e75e9d967850db27d 100644 (file)
--- a/src/uniq.c
+++ b/src/uniq.c
@@ -17,6 +17,17 @@
 
 /* Written by Richard Stallman and David MacKenzie. */
 \f
+#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 6e67ecb9b5ac09e24f84340899bd094e89238b1b..6dce782412f3475c53e8c794800f7216ffe7ec01 100644 (file)
--- 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. */
 \f
+#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>