merge with 1.8b

diff --git a/lib/regex.c b/lib/regex.c
index 15ca91bc54a29b81a91d415d880a8d017c08a0ef..8b7aecf0d80912e568f7a12d81897b45e3af585c 100644 (file)
--- a/lib/regex.c
+++ b/lib/regex.c
@@ -26,6 +26,17 @@
 
 #define _GNU_SOURCE
 
+#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
+
 /* We need this for `regex.h', and perhaps for the Emacs include files.  */
 #include <sys/types.h>