From: Jim Meyering Date: Thu, 21 Oct 1993 22:08:53 +0000 (+0000) Subject: merge with 1.8d X-Git-Tag: textutils-1_12_1~824 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d1df8c198d8878b77d1d1583bc7b3c491534616a;p=thirdparty%2Fcoreutils.git merge with 1.8d --- diff --git a/lib/memchr.c b/lib/memchr.c index 7495106362..bb8b813817 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 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 +#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 70d1c68548..8cbc61f7d0 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 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 +#else +#include "config.h" +#endif +#endif + #include #include #include diff --git a/src/cksum.c b/src/cksum.c index a3dd81dfe4..f6f7d26a3d 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 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 +#else +#include "config.h" +#endif +#endif + #ifdef CRCTAB #include diff --git a/src/comm.c b/src/comm.c index d79ca7bbff..1900661cda 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 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 +#else +#include "config.h" +#endif +#endif + #include #include #include diff --git a/src/csplit.c b/src/csplit.c index f2beb0fc0d..4fb9f2ca52 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 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 +#else +#include "config.h" +#endif +#endif + #include #include #include diff --git a/src/cut.c b/src/cut.c index 9a056c75c4..4953afc045 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 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 +#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 7acf5fd09c..92e8c61b71 100644 --- a/src/expand.c +++ b/src/expand.c @@ -33,6 +33,17 @@ David MacKenzie */ +#ifdef HAVE_CONFIG_H +#if defined (CONFIG_BROKETS) +/* We use 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 +#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 80fa04711b..39097c7248 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 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 +#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 5c34f6a3e2..82ad291410 100644 --- a/src/head.c +++ b/src/head.c @@ -33,6 +33,17 @@ David MacKenzie */ +#ifdef HAVE_CONFIG_H +#if defined (CONFIG_BROKETS) +/* We use 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 +#else +#include "config.h" +#endif +#endif + #include #include #include diff --git a/src/join.c b/src/join.c index cd9ea211c9..0113f86c4d 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 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 +#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 c91f11782a..8fb0cd8091 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 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 +#else +#include "config.h" +#endif +#endif + #include #include #include diff --git a/src/od.c b/src/od.c index 698630071b..c5c853bc86 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 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 +#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 24c617db53..d4a0f92953 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 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 +#else +#include "config.h" +#endif +#endif + #include #include #include diff --git a/src/pr.c b/src/pr.c index 3451fa38b6..9ac5a99d22 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 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 +#else +#include "config.h" +#endif +#endif + #include #include #include diff --git a/src/sort.c b/src/sort.c index 42e0b8e611..5253f5f892 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 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 +#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 b9aba04834..8dee177dda 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 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 +#else +#include "config.h" +#endif +#endif + #include #include #include diff --git a/src/sum.c b/src/sum.c index c625f7d955..3cf17662c4 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 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 +#else +#include "config.h" +#endif +#endif + #include #include #include diff --git a/src/tac.c b/src/tac.c index d6671e2146..34aa7e0510 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 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 +#else +#include "config.h" +#endif +#endif + #include #include #include diff --git a/src/tail.c b/src/tail.c index c6f0206b14..e5308a15c0 100644 --- a/src/tail.c +++ b/src/tail.c @@ -45,6 +45,17 @@ Extensions by David MacKenzie . tail -f for multiple files by Ian Lance Taylor . */ +#ifdef HAVE_CONFIG_H +#if defined (CONFIG_BROKETS) +/* We use 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 +#else +#include "config.h" +#endif +#endif + #include #include #include diff --git a/src/tr.c b/src/tr.c index f6c11b9530..aadab06cbc 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 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 +#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 7affd88b5e..5ab1e6bbb7 100644 --- a/src/unexpand.c +++ b/src/unexpand.c @@ -35,6 +35,17 @@ David MacKenzie */ +#ifdef HAVE_CONFIG_H +#if defined (CONFIG_BROKETS) +/* We use 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 +#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 9323397ba0..6ba6b6869c 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 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 +#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 6e67ecb9b5..6dce782412 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 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 +#else +#include "config.h" +#endif +#endif + #include #include #include