merge with 3.8.3b

1 files changed, 11 insertions, 0 deletions

diff --git a/src/dd.c b/src/dd.c
index fd1091488..9ff4cf993 100644
--- a/src/dd.c
+++ b/src/dd.c
@@ -53,6 +53,17 @@
    sync				Pad every input block to size of ibs with
 				trailing NULs. */
 
+#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>