From 44c053f00889b41f3452b41ea679c211894d7856 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 12 Oct 1993 14:49:11 +0000 Subject: merge with 1.8.1d --- lib/getusershell.c | 11 +++++++++++ lib/putenv.c | 11 +++++++++++ lib/strftime.c | 11 +++++++++++ old/sh-utils/ChangeLog | 5 +++++ src/basename.c | 11 +++++++++++ src/date.c | 11 +++++++++++ src/dirname.c | 11 +++++++++++ src/echo.c | 11 +++++++++++ src/env.c | 11 +++++++++++ src/expr.c | 11 +++++++++++ src/id.c | 11 +++++++++++ src/logname.c | 11 +++++++++++ src/nice.c | 11 +++++++++++ src/pathchk.c | 11 +++++++++++ src/printf.c | 11 +++++++++++ src/sleep.c | 11 +++++++++++ src/stty.c | 11 +++++++++++ src/su.c | 11 +++++++++++ src/tee.c | 11 +++++++++++ src/test.c | 11 +++++++++++ src/tty.c | 11 +++++++++++ src/uname.c | 11 +++++++++++ src/who.c | 11 +++++++++++ 23 files changed, 247 insertions(+) diff --git a/lib/getusershell.c b/lib/getusershell.c index 1dee6e7ab..2607535f2 100644 --- a/lib/getusershell.c +++ b/lib/getusershell.c @@ -17,6 +17,17 @@ /* Written by 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 + #ifndef SHELLS_FILE /* File containing a list of nonrestricted shells, one per line. */ #define SHELLS_FILE "/etc/shells" diff --git a/lib/putenv.c b/lib/putenv.c index c39d1b71e..573e62478 100644 --- a/lib/putenv.c +++ b/lib/putenv.c @@ -16,6 +16,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 + #include #include diff --git a/lib/strftime.c b/lib/strftime.c index cfd41adbe..569a3d448 100644 --- a/lib/strftime.c +++ b/lib/strftime.c @@ -73,6 +73,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 #if defined(TM_IN_SYS_TIME) || (!defined(HAVE_TM_ZONE) && !defined(HAVE_TZNAME)) #include diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog index 0cad2f5eb..8ea587c5a 100644 --- a/old/sh-utils/ChangeLog +++ b/old/sh-utils/ChangeLog @@ -1,3 +1,8 @@ +Tue Oct 12 00:53:26 1993 Jim Meyering (meyering@comco.com) + + * stime.c [HAVE_CONFIG_H, CONFIG_BROKETS]: Include + or "config.h". + Sun Oct 10 14:05:23 1993 Jim Meyering meyering@comco.com * false.sh, groups.sh, nohup.sh, true.sh: Add --help and --version. diff --git a/src/basename.c b/src/basename.c index ec8cd5a4e..75518e830 100644 --- a/src/basename.c +++ b/src/basename.c @@ -25,6 +25,17 @@ basename functions.lisp p => functions.lis */ +#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/date.c b/src/date.c index b80c47fe3..c31c344ec 100644 --- a/src/date.c +++ b/src/date.c @@ -39,6 +39,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/dirname.c b/src/dirname.c index a4209c89a..b6b46d738 100644 --- a/src/dirname.c +++ b/src/dirname.c @@ -17,6 +17,17 @@ /* Written by David MacKenzie and Jim Meyering. */ +#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/echo.c b/src/echo.c index 2e27abe63..ab0779eae 100644 --- a/src/echo.c +++ b/src/echo.c @@ -17,6 +17,17 @@ You should have received a copy of the GNU General Public License along with Bash; see the file COPYING. If not, write to the Free Software Foundation, 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 + #include #include #include "system.h" diff --git a/src/env.c b/src/env.c index b08d48311..0871ba0c4 100644 --- a/src/env.c +++ b/src/env.c @@ -77,6 +77,17 @@ { LOGNAME=foo PATH=/energy } */ +#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/expr.c b/src/expr.c index 97f7b39d8..221f5dd72 100644 --- a/src/expr.c +++ b/src/expr.c @@ -28,6 +28,17 @@ Define EVAL_TRACE to print an evaluation trace. */ +#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/id.c b/src/id.c index bd18ed855..daa65c86c 100644 --- a/src/id.c +++ b/src/id.c @@ -18,6 +18,17 @@ /* Written by Arnold Robbins, arnold@audiofax.com. Major rewrite 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/logname.c b/src/logname.c index 82c49feef..9a95bceee 100644 --- a/src/logname.c +++ b/src/logname.c @@ -15,6 +15,17 @@ along with this program; 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 + #include #include #include diff --git a/src/nice.c b/src/nice.c index 28e68d9f5..3cdc073f0 100644 --- a/src/nice.c +++ b/src/nice.c @@ -17,6 +17,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/pathchk.c b/src/pathchk.c index e6da04ea2..ee14ffc4e 100644 --- a/src/pathchk.c +++ b/src/pathchk.c @@ -38,6 +38,17 @@ David MacKenzie and Jim Meyering */ +#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/printf.c b/src/printf.c index e1bd4d3ab..3781eff44 100644 --- a/src/printf.c +++ b/src/printf.c @@ -43,6 +43,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/sleep.c b/src/sleep.c index 2858ff42f..f599a13c0 100644 --- a/src/sleep.c +++ b/src/sleep.c @@ -15,6 +15,17 @@ along with this program; 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 + #include #include #include diff --git a/src/stty.c b/src/stty.c index ea764ac33..4f97981ae 100644 --- a/src/stty.c +++ b/src/stty.c @@ -27,6 +27,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/su.c b/src/su.c index 7252a07e1..6f6a146f3 100644 --- a/src/su.c +++ b/src/su.c @@ -69,6 +69,17 @@ Written by 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/tee.c b/src/tee.c index b107ee053..0099d5c70 100644 --- a/src/tee.c +++ b/src/tee.c @@ -17,6 +17,17 @@ /* Mike Parker, Richard M. 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/test.c b/src/test.c index d905c63e6..658a30f29 100644 --- a/src/test.c +++ b/src/test.c @@ -24,6 +24,17 @@ the shell builtin version. */ /* #define TEST_STANDALONE */ +#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 diff --git a/src/tty.c b/src/tty.c index 1839ae1b0..6706afc01 100644 --- a/src/tty.c +++ b/src/tty.c @@ -22,6 +22,17 @@ Written by 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/uname.c b/src/uname.c index 366e1e34a..236e0d557 100644 --- a/src/uname.c +++ b/src/uname.c @@ -28,6 +28,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/who.c b/src/who.c index 15305a363..5f2e0d850 100644 --- a/src/who.c +++ b/src/who.c @@ -32,6 +32,17 @@ -H Print column headings at top. -w, -T -s plus mesg (+ or -, or ? if bad line). */ +#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 -- cgit v1.2.3-70-g09d2