merge with 1.8d

diff --git a/lib/memchr.c b/lib/memchr.c
index 74951063629be982e38b555be63f9d951f1fada2..bb8b81381700a3cb60417465dd3dd83cda0d032b 100644 (file)
--- 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 <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
+
 /* Search no more than N bytes of S for C.  */
 
 char *