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>