merge with 1.8.1d

diff --git a/lib/getusershell.c b/lib/getusershell.c
index 1dee6e7ab8a782bc789e088b80888bd61387018d..2607535f23ba39e98ac0a9b9e1d1283ee75e9fe0 100644 (file)
--- a/lib/getusershell.c
+++ b/lib/getusershell.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
+
 #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 c39d1b71e1d655b6156d4a04af7c79e80a02aa91..573e62478bd1caeb0ab36a2826bf673395b2b06f 100644 (file)
--- 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 <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 <sys/types.h>
 #include <errno.h>
 

diff --git a/lib/strftime.c b/lib/strftime.c
index cfd41adbee8ba1a6c94d4a570df30e7ff70d3aca..569a3d448e504bca02e6b5db42721eaf747bb82b 100644 (file)
--- a/lib/strftime.c
+++ b/lib/strftime.c
@@ -73,6 +73,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 <sys/types.h>
 #if defined(TM_IN_SYS_TIME) || (!defined(HAVE_TM_ZONE) && !defined(HAVE_TZNAME))
 #include <sys/time.h>

diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog
index 0cad2f5eb9d0527e6b708f63a18d17cada681523..8ea587c5a37ffb258cfef7ac7dc3ce312b908bab 100644 (file)
--- 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 <config.h>
+       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 ec8cd5a4e4b7cfb2fdc493bc95c1b47c569b8457..75518e830082e0a111e792ea6737f4cdc26ce56a 100644 (file)
--- 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 <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/date.c b/src/date.c
index b80c47fe335db4a5f6acc048506b4c781e8f24a3..c31c344ec0833e006a2ca248ec608596ee4bf81e 100644 (file)
--- a/src/date.c
+++ b/src/date.c
@@ -39,6 +39,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/dirname.c b/src/dirname.c
index a4209c89a555766ed6978554a0d0cddef21dc768..b6b46d73850b6c0f365e09f331b0d88e9f5f0e28 100644 (file)
--- 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 <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/echo.c b/src/echo.c
index 2e27abe63240a1fdb0af3c0b605ce8d0e97e83ca..ab0779eae0bf69500082c233e407fc04ff3c3e48 100644 (file)
--- 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 <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 "system.h"

diff --git a/src/env.c b/src/env.c
index b08d48311c67734ee7fd12b67a7e594508ca84ab..0871ba0c432eb32bd8304c941704fa83471bcdfa 100644 (file)
--- 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 <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/expr.c b/src/expr.c
index 97f7b39d8f6b14f4e12398ae7ec05754d7df1e27..221f5dd726445b9e5a777e982d93e8536c69a39e 100644 (file)
--- 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 <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 <ctype.h>
 #include <sys/types.h>

diff --git a/src/id.c b/src/id.c
index bd18ed855e37439f11cda0483522d89205c94b24..daa65c86cb7c9793acb2405e9bd589c40da5a897 100644 (file)
--- 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 <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/logname.c b/src/logname.c
index 82c49feef6eb89d643ccfdd9a3b5d6f7dc3aabbe..9a95bceee031d75f4af6673db60000918ec736d6 100644 (file)
--- 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 <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/nice.c b/src/nice.c
index 28e68d9f5cbef8c51669da7b416dd14af240ede5..3cdc073f0cf5adcc188c8803a4f6b95036ca4547 100644 (file)
--- a/src/nice.c
+++ b/src/nice.c
@@ -17,6 +17,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/pathchk.c b/src/pathchk.c
index e6da04ea25ccbeaeb17d3e29c7f0390cabe2377a..ee14ffc4e12e3192cdb454bbed28f41969ba407c 100644 (file)
--- a/src/pathchk.c
+++ b/src/pathchk.c
@@ -38,6 +38,17 @@
    David MacKenzie <djm@gnu.ai.mit.edu>
    and 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
+
 #include <stdio.h>
 #include <getopt.h>
 #include <sys/types.h>

diff --git a/src/printf.c b/src/printf.c
index e1bd4d3ab3af9f99bf7d72a121498fb766baa8ac..3781eff44128a199d9bf7c675b19705fec2bd70c 100644 (file)
--- a/src/printf.c
+++ b/src/printf.c
@@ -43,6 +43,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 <ctype.h>
 #include <sys/types.h>

diff --git a/src/sleep.c b/src/sleep.c
index 2858ff42faaf041edb5674219827108fa8116873..f599a13c0db996db1063e6c96a0137403f6a7503 100644 (file)
--- 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 <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/stty.c b/src/stty.c
index ea764ac3378f70d9191a45ab88591404d7db55f5..4f97981ae2c610f64e035d9a76dab12ed5e46971 100644 (file)
--- a/src/stty.c
+++ b/src/stty.c
@@ -27,6 +27,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 <sys/types.h>
 #include <termios.h>

diff --git a/src/su.c b/src/su.c
index 7252a07e18c8c005891e45a73324c868eef34fe0..6f6a146f36a9c2d97129d6ad532ef9183feb2ddd 100644 (file)
--- a/src/su.c
+++ b/src/su.c
@@ -69,6 +69,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
+
 #include <stdio.h>
 #include <getopt.h>
 #include <sys/types.h>

diff --git a/src/tee.c b/src/tee.c
index b107ee0530952f16feb06ac441e61567157e6b6e..0099d5c703c1659aef4017f02b05ee7c4d1a0be8 100644 (file)
--- 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 <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 <signal.h>

diff --git a/src/test.c b/src/test.c
index d905c63e630a4888aa1de35d33c8d8c1f068d002..658a30f291b6c8413e43ae3765eb40b10a4c3f6f 100644 (file)
--- 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 <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>
 

diff --git a/src/tty.c b/src/tty.c
index 1839ae1b0b6f35f67c8c19eea6a7c7261e06eb4c..6706afc016c6158261fad9ffa3088cd72f7722e0 100644 (file)
--- a/src/tty.c
+++ b/src/tty.c
@@ -22,6 +22,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
+
 #include <stdio.h>
 #include <getopt.h>
 #include <sys/types.h>

diff --git a/src/uname.c b/src/uname.c
index 366e1e34aae739c0b3e5eb4b440a75277863769f..236e0d557d9f3486f29bcf353d1bbfe7a07dc06b 100644 (file)
--- a/src/uname.c
+++ b/src/uname.c
@@ -28,6 +28,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 <sys/types.h>
 #include <sys/utsname.h>

diff --git a/src/who.c b/src/who.c
index 15305a3638b53265e453accc49bab0aa01a030cd..5f2e0d85016e15c6e621ca93c55092d64edc2da6 100644 (file)
--- 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 <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 <utmp.h>