Resolves: #214533

Summary: configure needs to support --with-fhs (Comment #6)
Changes: Added the following include next to the end of the copyright block.
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+

41 files changed, 210 insertions, 2 deletions

diff --git a/ldap/servers/slapd/tools/dbscan.c b/ldap/servers/slapd/tools/dbscan.c
index 178762ec..7f9433c2 100644
--- a/ldap/servers/slapd/tools/dbscan.c
+++ b/ldap/servers/slapd/tools/dbscan.c
@@ -35,6 +35,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 /*
  * small program to scan a Directory Server db file and dump the contents
  *
diff --git a/ldap/servers/slapd/tools/eggencode.c b/ldap/servers/slapd/tools/eggencode.c
index a00d7601..c9d9c1c7 100644
--- a/ldap/servers/slapd/tools/eggencode.c
+++ b/ldap/servers/slapd/tools/eggencode.c
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 /*
  * Easter egg encoder.  See ../fedse.c:egg_decode() for the mirror image.
  */
diff --git a/ldap/servers/slapd/tools/keyupg.c b/ldap/servers/slapd/tools/keyupg.c
index fdb115a0..3fb0a2f7 100644
--- a/ldap/servers/slapd/tools/keyupg.c
+++ b/ldap/servers/slapd/tools/keyupg.c
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 /*
  *
  * keyupg.c
diff --git a/ldap/servers/slapd/tools/ldclt/data.c b/ldap/servers/slapd/tools/ldclt/data.c
index 73b2c238..a27d088e 100644
--- a/ldap/servers/slapd/tools/ldclt/data.c
+++ b/ldap/servers/slapd/tools/ldclt/data.c
@@ -38,6 +38,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 /*
 	FILE :		data.c
 	AUTHOR :	Jean-Luc SCHWING
diff --git a/ldap/servers/slapd/tools/ldclt/ldap-private.h b/ldap/servers/slapd/tools/ldclt/ldap-private.h
index 7db687d9..b9773a4f 100644
--- a/ldap/servers/slapd/tools/ldclt/ldap-private.h
+++ b/ldap/servers/slapd/tools/ldclt/ldap-private.h
@@ -38,6 +38,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 #ifndef _LDAP_PRIVATE_H
 #define _LDAP_PRIVATE_H
 
diff --git a/ldap/servers/slapd/tools/ldclt/ldapfct.c b/ldap/servers/slapd/tools/ldclt/ldapfct.c
index 213569d2..c9078e66 100644
--- a/ldap/servers/slapd/tools/ldclt/ldapfct.c
+++ b/ldap/servers/slapd/tools/ldclt/ldapfct.c
@@ -38,6 +38,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 /*
 	FILE :		ldapfct.c
 	AUTHOR :	Jean-Luc SCHWING
diff --git a/ldap/servers/slapd/tools/ldclt/ldclt.c b/ldap/servers/slapd/tools/ldclt/ldclt.c
index f4114c7c..2c7048a0 100644
--- a/ldap/servers/slapd/tools/ldclt/ldclt.c
+++ b/ldap/servers/slapd/tools/ldclt/ldclt.c
@@ -38,6 +38,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 /*
 	FILE :		ldclt.c
 	AUTHOR :	Jean-Luc SCHWING
diff --git a/ldap/servers/slapd/tools/ldclt/ldclt.h b/ldap/servers/slapd/tools/ldclt/ldclt.h
index f4262e64..6413b39d 100644
--- a/ldap/servers/slapd/tools/ldclt/ldclt.h
+++ b/ldap/servers/slapd/tools/ldclt/ldclt.h
@@ -38,6 +38,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 /*
 	FILE :		ldclt.h
 	AUTHOR :	Jean-Luc SCHWING
diff --git a/ldap/servers/slapd/tools/ldclt/ldcltU.c b/ldap/servers/slapd/tools/ldclt/ldcltU.c
index 8c72be92..6f23dd1f 100644
--- a/ldap/servers/slapd/tools/ldclt/ldcltU.c
+++ b/ldap/servers/slapd/tools/ldclt/ldcltU.c
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 #include <stdio.h>
 
 
diff --git a/ldap/servers/slapd/tools/ldclt/opCheck.c b/ldap/servers/slapd/tools/ldclt/opCheck.c
index b9c200c0..e41ba30d 100644
--- a/ldap/servers/slapd/tools/ldclt/opCheck.c
+++ b/ldap/servers/slapd/tools/ldclt/opCheck.c
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 /*
 	FILE :		opCheck.c
 	AUTHOR :        Jean-Luc SCHWING
diff --git a/ldap/servers/slapd/tools/ldclt/parser.c b/ldap/servers/slapd/tools/ldclt/parser.c
index 84f574f0..0bd0a150 100644
--- a/ldap/servers/slapd/tools/ldclt/parser.c
+++ b/ldap/servers/slapd/tools/ldclt/parser.c
@@ -38,6 +38,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 /*
 	FILE :		parser.c
 	AUTHOR :        Jean-Luc SCHWING
diff --git a/ldap/servers/slapd/tools/ldclt/port.c b/ldap/servers/slapd/tools/ldclt/port.c
index 0b1ddb09..f21139bc 100644
--- a/ldap/servers/slapd/tools/ldclt/port.c
+++ b/ldap/servers/slapd/tools/ldclt/port.c
@@ -38,6 +38,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 /*
         FILE :		port.c
         AUTHOR :        Jean-Luc SCHWING
diff --git a/ldap/servers/slapd/tools/ldclt/port.h b/ldap/servers/slapd/tools/ldclt/port.h
index e247936c..6230ea84 100644
--- a/ldap/servers/slapd/tools/ldclt/port.h
+++ b/ldap/servers/slapd/tools/ldclt/port.h
@@ -38,6 +38,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 /*
         FILE :		port.h
         AUTHOR :        Jean-Luc SCHWING
diff --git a/ldap/servers/slapd/tools/ldclt/remote.h b/ldap/servers/slapd/tools/ldclt/remote.h
index 1a99fba1..d10dcaa3 100644
--- a/ldap/servers/slapd/tools/ldclt/remote.h
+++ b/ldap/servers/slapd/tools/ldclt/remote.h
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 /*
         FILE :		remote.h
         AUTHOR :        Jean-Luc SCHWING
diff --git a/ldap/servers/slapd/tools/ldclt/repcheck.c b/ldap/servers/slapd/tools/ldclt/repcheck.c
index 8851f7fe..a2d2989b 100644
--- a/ldap/servers/slapd/tools/ldclt/repcheck.c
+++ b/ldap/servers/slapd/tools/ldclt/repcheck.c
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 #include <stdio.h>
 #include <time.h>
 #include <string.h>
diff --git a/ldap/servers/slapd/tools/ldclt/repslave.c b/ldap/servers/slapd/tools/ldclt/repslave.c
index 3e892f66..b64bfe6c 100644
--- a/ldap/servers/slapd/tools/ldclt/repslave.c
+++ b/ldap/servers/slapd/tools/ldclt/repslave.c
@@ -38,6 +38,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 /*
         FILE :		repslave.c
         AUTHOR :        Fabio Pistolesi
diff --git a/ldap/servers/slapd/tools/ldclt/scalab01.c b/ldap/servers/slapd/tools/ldclt/scalab01.c
index 2d0074ee..7a8ed5c4 100644
--- a/ldap/servers/slapd/tools/ldclt/scalab01.c
+++ b/ldap/servers/slapd/tools/ldclt/scalab01.c
@@ -38,6 +38,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 /*
 	FILE :		scalab01.c
 	AUTHOR :	Jean-Luc SCHWING
diff --git a/ldap/servers/slapd/tools/ldclt/scalab01.h b/ldap/servers/slapd/tools/ldclt/scalab01.h
index 381c8bab..5bac3397 100644
--- a/ldap/servers/slapd/tools/ldclt/scalab01.h
+++ b/ldap/servers/slapd/tools/ldclt/scalab01.h
@@ -38,6 +38,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 /*
         FILE :		scalab01.h
         AUTHOR :        Jean-Luc SCHWING
diff --git a/ldap/servers/slapd/tools/ldclt/srv.c b/ldap/servers/slapd/tools/ldclt/srv.c
index 80c2608a..eab98c89 100644
--- a/ldap/servers/slapd/tools/ldclt/srv.c
+++ b/ldap/servers/slapd/tools/ldclt/srv.c
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 #include <stdio.h>
 #include <time.h>
 #include <string.h>
diff --git a/ldap/servers/slapd/tools/ldclt/threadMain.c b/ldap/servers/slapd/tools/ldclt/threadMain.c
index f2f23725..bdba2af9 100644
--- a/ldap/servers/slapd/tools/ldclt/threadMain.c
+++ b/ldap/servers/slapd/tools/ldclt/threadMain.c
@@ -38,6 +38,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 /*
 	FILE :		threadMain.c
 	AUTHOR :	Jean-Luc SCHWING
diff --git a/ldap/servers/slapd/tools/ldclt/utils.c b/ldap/servers/slapd/tools/ldclt/utils.c
index 54b6c150..123fea46 100644
--- a/ldap/servers/slapd/tools/ldclt/utils.c
+++ b/ldap/servers/slapd/tools/ldclt/utils.c
@@ -38,6 +38,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 /*
 	FILE :		utils.c
 	AUTHOR :        Jean-Luc SCHWING
diff --git a/ldap/servers/slapd/tools/ldclt/utils.h b/ldap/servers/slapd/tools/ldclt/utils.h
index 37f7a934..52b6e812 100644
--- a/ldap/servers/slapd/tools/ldclt/utils.h
+++ b/ldap/servers/slapd/tools/ldclt/utils.h
@@ -38,6 +38,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 /*
 	FILE :		utils.h
 	AUTHOR :        Jean-Luc SCHWING
diff --git a/ldap/servers/slapd/tools/ldclt/workarounds.c b/ldap/servers/slapd/tools/ldclt/workarounds.c
index 85d96dea..5275e6de 100644
--- a/ldap/servers/slapd/tools/ldclt/workarounds.c
+++ b/ldap/servers/slapd/tools/ldclt/workarounds.c
@@ -38,6 +38,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 /*
         FILE :		workarounds.c
         AUTHOR :        Jean-Luc SCHWING
diff --git a/ldap/servers/slapd/tools/ldif.c b/ldap/servers/slapd/tools/ldif.c
index 08b33424..5e4e63e2 100644
--- a/ldap/servers/slapd/tools/ldif.c
+++ b/ldap/servers/slapd/tools/ldif.c
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <memory.h>
diff --git a/ldap/servers/slapd/tools/migratecred.c b/ldap/servers/slapd/tools/migratecred.c
index b8543b0f..4c764a71 100644
--- a/ldap/servers/slapd/tools/migratecred.c
+++ b/ldap/servers/slapd/tools/migratecred.c
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 #include <stdio.h>
 #include <string.h>
 #include <limits.h>
diff --git a/ldap/servers/slapd/tools/mkdep.c b/ldap/servers/slapd/tools/mkdep.c
index 821aebfb..e5f49e0d 100644
--- a/ldap/servers/slapd/tools/mkdep.c
+++ b/ldap/servers/slapd/tools/mkdep.c
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 /*
  * Originally by Linus Torvalds.
  * Smart CONFIG_* processing by Werner Almesberger, Michael Chastain.
diff --git a/ldap/servers/slapd/tools/mmldif.c b/ldap/servers/slapd/tools/mmldif.c
index 7274930b..fb820823 100644
--- a/ldap/servers/slapd/tools/mmldif.c
+++ b/ldap/servers/slapd/tools/mmldif.c
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 #include	<stdio.h>
 #include	<ctype.h>
 #include	<string.h>
diff --git a/ldap/servers/slapd/tools/pwenc.c b/ldap/servers/slapd/tools/pwenc.c
index 524c6a27..c833bb2e 100644
--- a/ldap/servers/slapd/tools/pwenc.c
+++ b/ldap/servers/slapd/tools/pwenc.c
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #if defined( _WIN32 )
 #include <sys/stat.h> /* for S_IREAD and S_IWRITE */
 #include <windows.h>
diff --git a/ldap/servers/slapd/tools/rsearch/addthread.c b/ldap/servers/slapd/tools/rsearch/addthread.c
index ca88d10a..d87c5a53 100644
--- a/ldap/servers/slapd/tools/rsearch/addthread.c
+++ b/ldap/servers/slapd/tools/rsearch/addthread.c
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/ldap/servers/slapd/tools/rsearch/addthread.h b/ldap/servers/slapd/tools/rsearch/addthread.h
index 0b17cd05..385808b0 100644
--- a/ldap/servers/slapd/tools/rsearch/addthread.h
+++ b/ldap/servers/slapd/tools/rsearch/addthread.h
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 #ifndef _ADDTHREAD_H
 #define _ADDTHREAD_H
 
diff --git a/ldap/servers/slapd/tools/rsearch/infadd.c b/ldap/servers/slapd/tools/rsearch/infadd.c
index 818ed37c..039f85cb 100644
--- a/ldap/servers/slapd/tools/rsearch/infadd.c
+++ b/ldap/servers/slapd/tools/rsearch/infadd.c
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 /*
  * XP port of dboreham's NT tool "infinite_add"
  * robey, june 1998
@@ -338,8 +343,11 @@ int main(int argc, char **argv)
                         ntot);
         }
         if (!quiet && (numThreads > 1 || !verbose)) {
-            fprintf(stdout, "Average rate:%7.2f, total: %u\n", 
-                       (double)total/(double)numThreads, ntotal);
+            double val = 1000.0 * (double)total / (double)sampleInterval;
+            fprintf(stdout, "Rate: %7.2f/thr (%6.2f/sec =%7.4fms/op), "
+                            "total: %u (%d thr)\n", 
+                    (double)total/(double)numThreads, val, 
+                    (double)1000.0/val, ntotal, numThreads);
         }
         if (lmtCount && ntotal >= lmtCount) {
             if (!quiet) {
diff --git a/ldap/servers/slapd/tools/rsearch/infadd.h b/ldap/servers/slapd/tools/rsearch/infadd.h
index 1a963da0..0eae2ac1 100644
--- a/ldap/servers/slapd/tools/rsearch/infadd.h
+++ b/ldap/servers/slapd/tools/rsearch/infadd.h
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 #ifndef _INFADD_H
 #define _INFADD_H
 
diff --git a/ldap/servers/slapd/tools/rsearch/main.c b/ldap/servers/slapd/tools/rsearch/main.c
index f9313320..33bc0a12 100644
--- a/ldap/servers/slapd/tools/rsearch/main.c
+++ b/ldap/servers/slapd/tools/rsearch/main.c
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 /*
  * this was just easier to start from scratch.  windows is too different
  * from nspr.
diff --git a/ldap/servers/slapd/tools/rsearch/nametable.c b/ldap/servers/slapd/tools/rsearch/nametable.c
index c0026324..0a4b6fce 100644
--- a/ldap/servers/slapd/tools/rsearch/nametable.c
+++ b/ldap/servers/slapd/tools/rsearch/nametable.c
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/ldap/servers/slapd/tools/rsearch/nametable.h b/ldap/servers/slapd/tools/rsearch/nametable.h
index c66c568a..82780faa 100644
--- a/ldap/servers/slapd/tools/rsearch/nametable.h
+++ b/ldap/servers/slapd/tools/rsearch/nametable.h
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 #ifndef _NAMETABLE_H
 #define _NAMETABLE_H
 
diff --git a/ldap/servers/slapd/tools/rsearch/rsearch.c b/ldap/servers/slapd/tools/rsearch/rsearch.c
index 729a8d72..17e998d2 100644
--- a/ldap/servers/slapd/tools/rsearch/rsearch.c
+++ b/ldap/servers/slapd/tools/rsearch/rsearch.c
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 /*
  * XP port of dboreham's NT tool "repeated_search"
  * robey, march 1998
diff --git a/ldap/servers/slapd/tools/rsearch/rsearch.h b/ldap/servers/slapd/tools/rsearch/rsearch.h
index e610bafa..3f797cc0 100644
--- a/ldap/servers/slapd/tools/rsearch/rsearch.h
+++ b/ldap/servers/slapd/tools/rsearch/rsearch.h
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 #ifndef _RSEARCH_H
 #define _RSEARCH_H
 
diff --git a/ldap/servers/slapd/tools/rsearch/sdattable.c b/ldap/servers/slapd/tools/rsearch/sdattable.c
index 7d63e1f2..126ddc3b 100644
--- a/ldap/servers/slapd/tools/rsearch/sdattable.c
+++ b/ldap/servers/slapd/tools/rsearch/sdattable.c
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/ldap/servers/slapd/tools/rsearch/sdattable.h b/ldap/servers/slapd/tools/rsearch/sdattable.h
index 95507d18..5acf3996 100644
--- a/ldap/servers/slapd/tools/rsearch/sdattable.h
+++ b/ldap/servers/slapd/tools/rsearch/sdattable.h
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 #ifndef _SDATTABLE_H
 #define _SDATTABLE_H
 
diff --git a/ldap/servers/slapd/tools/rsearch/searchthread.c b/ldap/servers/slapd/tools/rsearch/searchthread.c
index 0ab422e6..cfb16b52 100644
--- a/ldap/servers/slapd/tools/rsearch/searchthread.c
+++ b/ldap/servers/slapd/tools/rsearch/searchthread.c
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/ldap/servers/slapd/tools/rsearch/searchthread.h b/ldap/servers/slapd/tools/rsearch/searchthread.h
index 15629be4..a2e1a238 100644
--- a/ldap/servers/slapd/tools/rsearch/searchthread.h
+++ b/ldap/servers/slapd/tools/rsearch/searchthread.h
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 #ifndef _SEARCHTHREAD_H
 #define _SEARCHTHREAD_H