merge with 1.10n2

24 files changed, 1 insertions, 169 deletions

diff --git a/src/basename.c b/src/basename.c
index 835f229a6..10726d225 100644
--- a/src/basename.c
+++ b/src/basename.c
@@ -26,14 +26,7 @@
    => 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>
diff --git a/src/date.c b/src/date.c
index 36a77fee4..e22ba8512 100644
--- a/src/date.c
+++ b/src/date.c
@@ -40,14 +40,7 @@
    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>
diff --git a/src/dirname.c b/src/dirname.c
index 09b55464f..22e983dd2 100644
--- a/src/dirname.c
+++ b/src/dirname.c
@@ -18,14 +18,7 @@
 /* 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>
diff --git a/src/echo.c b/src/echo.c
index d1d25d5ec..ea7510e63 100644
--- a/src/echo.c
+++ b/src/echo.c
@@ -18,14 +18,7 @@ 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>
diff --git a/src/env.c b/src/env.c
index dc3f10ed3..46a4071e8 100644
--- a/src/env.c
+++ b/src/env.c
@@ -78,14 +78,7 @@
 */
 
 #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>
diff --git a/src/expr.c b/src/expr.c
index 7c77938c4..7cf9110b3 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -29,14 +29,7 @@
    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>
diff --git a/src/hostname.c b/src/hostname.c
index d49aa1c48..2a7939864 100644
--- a/src/hostname.c
+++ b/src/hostname.c
@@ -18,14 +18,7 @@
 /* Jim Meyering <meyering@comco.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>
diff --git a/src/id.c b/src/id.c
index 2b9e13710..706146661 100644
--- a/src/id.c
+++ b/src/id.c
@@ -19,14 +19,7 @@
    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>
diff --git a/src/logname.c b/src/logname.c
index a7b3675fa..bc21afcd4 100644
--- a/src/logname.c
+++ b/src/logname.c
@@ -16,14 +16,7 @@
    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>
diff --git a/src/nice.c b/src/nice.c
index acf636468..444131f7a 100644
--- a/src/nice.c
+++ b/src/nice.c
@@ -18,14 +18,7 @@
 /* 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>
diff --git a/src/pathchk.c b/src/pathchk.c
index 7d75a35c7..3b7c8e534 100644
--- a/src/pathchk.c
+++ b/src/pathchk.c
@@ -39,14 +39,7 @@
    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>
diff --git a/src/printenv.c b/src/printenv.c
index f7118ab77..4ddaeba8c 100644
--- a/src/printenv.c
+++ b/src/printenv.c
@@ -28,14 +28,7 @@
    David MacKenzie and Richard Mlynarik */
 
 #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>
diff --git a/src/printf.c b/src/printf.c
index 2719053c1..c4728114e 100644
--- a/src/printf.c
+++ b/src/printf.c
@@ -44,14 +44,7 @@
    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>
diff --git a/src/pwd.c b/src/pwd.c
index c57ef1434..8da058a6b 100644
--- a/src/pwd.c
+++ b/src/pwd.c
@@ -18,14 +18,7 @@
 /* Jim Meyering <meyering@comco.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>
diff --git a/src/sleep.c b/src/sleep.c
index 7172866b8..dda1ea48a 100644
--- a/src/sleep.c
+++ b/src/sleep.c
@@ -16,14 +16,7 @@
    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>
diff --git a/src/stty.c b/src/stty.c
index c1dc3e408..5efeb243b 100644
--- a/src/stty.c
+++ b/src/stty.c
@@ -28,14 +28,7 @@
    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>
diff --git a/src/su.c b/src/su.c
index 97392f15b..e67d048e5 100644
--- a/src/su.c
+++ b/src/su.c
@@ -70,14 +70,7 @@
    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>
diff --git a/src/tee.c b/src/tee.c
index 3e322a4db..ca1e27123 100644
--- a/src/tee.c
+++ b/src/tee.c
@@ -18,14 +18,7 @@
 /* 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>
diff --git a/src/test.c b/src/test.c
index 568af97f9..7aefb0a46 100644
--- a/src/test.c
+++ b/src/test.c
@@ -25,14 +25,7 @@
 /* #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>
diff --git a/src/tty.c b/src/tty.c
index 4f49897e2..3d6c532be 100644
--- a/src/tty.c
+++ b/src/tty.c
@@ -23,14 +23,7 @@
    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>
diff --git a/src/uname.c b/src/uname.c
index 4f0fda9bb..ae34b543c 100644
--- a/src/uname.c
+++ b/src/uname.c
@@ -29,14 +29,7 @@
    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>
diff --git a/src/who.c b/src/who.c
index 69216698c..c173977c8 100644
--- a/src/who.c
+++ b/src/who.c
@@ -33,14 +33,7 @@
    -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>
diff --git a/src/whoami.c b/src/whoami.c
index 68d715350..6bb43153f 100644
--- a/src/whoami.c
+++ b/src/whoami.c
@@ -19,14 +19,7 @@
 /* Written by Richard Mlynarik. */
 
 #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>
diff --git a/src/yes.c b/src/yes.c
index 8dd443fab..68bf9ae14 100644
--- a/src/yes.c
+++ b/src/yes.c
@@ -18,14 +18,7 @@
 /* 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>