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
+

46 files changed, 230 insertions, 0 deletions

diff --git a/ldap/admin/include/dsalib.h b/ldap/admin/include/dsalib.h
index 96ff5ee8..7383295d 100644
--- a/ldap/admin/include/dsalib.h
+++ b/ldap/admin/include/dsalib.h
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 #ifndef __dsalib_h
 #define __dsalib_h
 
diff --git a/ldap/admin/include/dsalib_pw.h b/ldap/admin/include/dsalib_pw.h
index 3510d90a..a849826f 100644
--- a/ldap/admin/include/dsalib_pw.h
+++ b/ldap/admin/include/dsalib_pw.h
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 #ifndef __dsalib_pw_h
 #define __dsalib_pw_h
 
diff --git a/ldap/admin/include/dsalib_schema.h b/ldap/admin/include/dsalib_schema.h
index a03ba3ae..0ab7fe87 100644
--- a/ldap/admin/include/dsalib_schema.h
+++ b/ldap/admin/include/dsalib_schema.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 /*
  * Routines to parse schema LDIF
  *
diff --git a/ldap/admin/include/nterrors.h b/ldap/admin/include/nterrors.h
index 1a74ac50..255cac13 100644
--- a/ldap/admin/include/nterrors.h
+++ b/ldap/admin/include/nterrors.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 /* DO NOT EDIT THIS FILE - it is automatically generated */
 
 struct _NtError {
diff --git a/ldap/admin/lib/dsalib_conf.c b/ldap/admin/lib/dsalib_conf.c
index 86d9dc31..19161c59 100644
--- a/ldap/admin/lib/dsalib_conf.c
+++ b/ldap/admin/lib/dsalib_conf.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( XP_WIN32 )
 #include <windows.h>
 #include <process.h>
diff --git a/ldap/admin/lib/dsalib_confs.c b/ldap/admin/lib/dsalib_confs.c
index fc6c71fc..0a2023ce 100644
--- a/ldap/admin/lib/dsalib_confs.c
+++ b/ldap/admin/lib/dsalib_confs.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
+
 /*
  * Some of the simple conf stuff here. Must not call any
  * libadmin functions! This is needed by ds_config.c
diff --git a/ldap/admin/lib/dsalib_db.c b/ldap/admin/lib/dsalib_db.c
index 60916b14..c974b766 100644
--- a/ldap/admin/lib/dsalib_db.c
+++ b/ldap/admin/lib/dsalib_db.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( XP_WIN32 )
 #include <windows.h>
 #include <process.h>
diff --git a/ldap/admin/lib/dsalib_debug.c b/ldap/admin/lib/dsalib_debug.c
index 1dc2d808..6be074ae 100644
--- a/ldap/admin/lib/dsalib_debug.c
+++ b/ldap/admin/lib/dsalib_debug.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( XP_WIN32 )
 #include <windows.h>
 #endif
diff --git a/ldap/admin/lib/dsalib_dn.c b/ldap/admin/lib/dsalib_dn.c
index cd157876..8cd43235 100644
--- a/ldap/admin/lib/dsalib_dn.c
+++ b/ldap/admin/lib/dsalib_dn.c
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 #if defined( XP_WIN32 )
 #include <windows.h>
 #else
diff --git a/ldap/admin/lib/dsalib_filename.c b/ldap/admin/lib/dsalib_filename.c
index 8f6d66f7..7395859a 100644
--- a/ldap/admin/lib/dsalib_filename.c
+++ b/ldap/admin/lib/dsalib_filename.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( XP_WIN32 )
 #include <windows.h>
 #endif
diff --git a/ldap/admin/lib/dsalib_html.c b/ldap/admin/lib/dsalib_html.c
index c1ef4888..1c3377c8 100644
--- a/ldap/admin/lib/dsalib_html.c
+++ b/ldap/admin/lib/dsalib_html.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( XP_WIN32 )
 #include <windows.h>
 #endif
diff --git a/ldap/admin/lib/dsalib_ldif.c b/ldap/admin/lib/dsalib_ldif.c
index 9813b918..1009a4eb 100644
--- a/ldap/admin/lib/dsalib_ldif.c
+++ b/ldap/admin/lib/dsalib_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
+
 #if defined( XP_WIN32 )
 #include <windows.h>
 #include <process.h>
diff --git a/ldap/admin/lib/dsalib_location.c b/ldap/admin/lib/dsalib_location.c
index 6aefb061..7b4ae627 100644
--- a/ldap/admin/lib/dsalib_location.c
+++ b/ldap/admin/lib/dsalib_location.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( XP_WIN32 )
 #include <windows.h>
 #endif
diff --git a/ldap/admin/lib/dsalib_pw.c b/ldap/admin/lib/dsalib_pw.c
index 3c64ba0f..0696f7cf 100644
--- a/ldap/admin/lib/dsalib_pw.c
+++ b/ldap/admin/lib/dsalib_pw.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
+
 /*
  * Adjust password policy management related variables.
  * 
diff --git a/ldap/admin/lib/dsalib_tailf.c b/ldap/admin/lib/dsalib_tailf.c
index 8bddf224..a9db5ce3 100644
--- a/ldap/admin/lib/dsalib_tailf.c
+++ b/ldap/admin/lib/dsalib_tailf.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( XP_WIN32 )
 #include <windows.h>
 #endif
diff --git a/ldap/admin/lib/dsalib_updown.c b/ldap/admin/lib/dsalib_updown.c
index d769ec4f..a1f5fcd5 100644
--- a/ldap/admin/lib/dsalib_updown.c
+++ b/ldap/admin/lib/dsalib_updown.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( XP_WIN32 )
 #include <windows.h>
 #include <process.h>
diff --git a/ldap/admin/lib/dsalib_util.c b/ldap/admin/lib/dsalib_util.c
index bebb38a9..0a0cfe0c 100644
--- a/ldap/admin/lib/dsalib_util.c
+++ b/ldap/admin/lib/dsalib_util.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( XP_WIN32 )
 #include <windows.h>
 #include <io.h>
diff --git a/ldap/admin/src/addindex.c b/ldap/admin/src/addindex.c
index 22732dbb..4a3d0dff 100644
--- a/ldap/admin/src/addindex.c
+++ b/ldap/admin/src/addindex.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
+
 /*
  * addindex.c:  Creates one or more indexes for specified attributes
  * 
diff --git a/ldap/admin/src/cfg_sspt.c b/ldap/admin/src/cfg_sspt.c
index 239da87d..5d6028c3 100644
--- a/ldap/admin/src/cfg_sspt.c
+++ b/ldap/admin/src/cfg_sspt.c
@@ -36,6 +36,11 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/ldap/admin/src/cfg_sspt.h b/ldap/admin/src/cfg_sspt.h
index d437080a..15ad7237 100644
--- a/ldap/admin/src/cfg_sspt.h
+++ b/ldap/admin/src/cfg_sspt.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifndef __cfg_sspt_h
 #define __cfg_sspt_h
 
diff --git a/ldap/admin/src/configure_instance.cpp b/ldap/admin/src/configure_instance.cpp
index 80b5b24d..c70cc7ea 100644
--- a/ldap/admin/src/configure_instance.cpp
+++ b/ldap/admin/src/configure_instance.cpp
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 /*********************************************************************
 **
 **
diff --git a/ldap/admin/src/configure_instance.h b/ldap/admin/src/configure_instance.h
index 7127af83..aedde9e1 100644
--- a/ldap/admin/src/configure_instance.h
+++ b/ldap/admin/src/configure_instance.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 /***********************************************************************
 **
 **
diff --git a/ldap/admin/src/create_instance.c b/ldap/admin/src/create_instance.c
index 40e37934..0bae15cc 100644
--- a/ldap/admin/src/create_instance.c
+++ b/ldap/admin/src/create_instance.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
+
 /*
  * create_instance.c: Routines for creating an instance of a Directory Server
  *
diff --git a/ldap/admin/src/create_instance.h b/ldap/admin/src/create_instance.h
index c63f1a87..971da882 100644
--- a/ldap/admin/src/create_instance.h
+++ b/ldap/admin/src/create_instance.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 /*
  * create_instance.h: create an instance of a directory server
  * 
diff --git a/ldap/admin/src/ds_bak2db.c b/ldap/admin/src/ds_bak2db.c
index 57c17fc4..39021dbd 100644
--- a/ldap/admin/src/ds_bak2db.c
+++ b/ldap/admin/src/ds_bak2db.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
+
 /*
  * Restores a database.
  * 
diff --git a/ldap/admin/src/ds_db2bak.c b/ldap/admin/src/ds_db2bak.c
index 0a1ceeed..a8e280b9 100644
--- a/ldap/admin/src/ds_db2bak.c
+++ b/ldap/admin/src/ds_db2bak.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
+
 /*
  * Backs up the database.
  * 
diff --git a/ldap/admin/src/ds_db2ldif.c b/ldap/admin/src/ds_db2ldif.c
index a63894d2..031ee2dc 100644
--- a/ldap/admin/src/ds_db2ldif.c
+++ b/ldap/admin/src/ds_db2ldif.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
+
 /*
  * Converts the database into an ldif file.
  * 
diff --git a/ldap/admin/src/ds_ldif2db.c b/ldap/admin/src/ds_ldif2db.c
index 276a0fe5..aef7fed8 100644
--- a/ldap/admin/src/ds_ldif2db.c
+++ b/ldap/admin/src/ds_ldif2db.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
+
 /*
  * ds_ldif2db.c:  Converts an ldif file into a database.
  * 
diff --git a/ldap/admin/src/ds_listdb.c b/ldap/admin/src/ds_listdb.c
index 197e5696..fc44d5d3 100644
--- a/ldap/admin/src/ds_listdb.c
+++ b/ldap/admin/src/ds_listdb.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
+
 /* 
  * List the database backup directories.
  * No HTML - this is for DS 4.0.
diff --git a/ldap/admin/src/ds_newinst.c b/ldap/admin/src/ds_newinst.c
index 79ee7fa9..5de0c4d7 100644
--- a/ldap/admin/src/ds_newinst.c
+++ b/ldap/admin/src/ds_newinst.c
@@ -34,6 +34,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 /*
  * ds_newinst.c - creates a new instance of directory server, scripts,
  * configuration, etc.  Does not create any Admin Server stuff or
diff --git a/ldap/admin/src/ds_remove.c b/ldap/admin/src/ds_remove.c
index aefc88bf..660104bc 100644
--- a/ldap/admin/src/ds_remove.c
+++ b/ldap/admin/src/ds_remove.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
+
 /*
  * Remove the server
  * 
diff --git a/ldap/admin/src/ds_remove_uninst.cpp b/ldap/admin/src/ds_remove_uninst.cpp
index 118c5d55..b7699176 100644
--- a/ldap/admin/src/ds_remove_uninst.cpp
+++ b/ldap/admin/src/ds_remove_uninst.cpp
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 // ds_remove_uninst.cpp
 //
 // ds_remove routines that use c++ calls in adminutil
diff --git a/ldap/admin/src/ds_remove_uninst.h b/ldap/admin/src/ds_remove_uninst.h
index a1500696..6ce2b6b1 100644
--- a/ldap/admin/src/ds_remove_uninst.h
+++ b/ldap/admin/src/ds_remove_uninst.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 /*	ds_remove_uninst.h */
 
 
diff --git a/ldap/admin/src/ds_rmdb.c b/ldap/admin/src/ds_rmdb.c
index 476897f6..2c6f47e3 100644
--- a/ldap/admin/src/ds_rmdb.c
+++ b/ldap/admin/src/ds_rmdb.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
+
 /* 
  * Delete backed-up database files.
  *
diff --git a/ldap/admin/src/ds_snmpctrl.c b/ldap/admin/src/ds_snmpctrl.c
index 06c30503..1ac2fea6 100644
--- a/ldap/admin/src/ds_snmpctrl.c
+++ b/ldap/admin/src/ds_snmpctrl.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
+
 /*
  * snmpctrl.c - start/stop/restart LDAP-based SNMP subagent
  *
diff --git a/ldap/admin/src/init_ds_env.c b/ldap/admin/src/init_ds_env.c
index c4a1ce49..f6ca8a03 100644
--- a/ldap/admin/src/init_ds_env.c
+++ b/ldap/admin/src/init_ds_env.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
+
 /*
  * Set up environment for CGIs.
  * 
diff --git a/ldap/admin/src/init_ds_env.h b/ldap/admin/src/init_ds_env.h
index fcb9c8c5..7e6b7275 100644
--- a/ldap/admin/src/init_ds_env.h
+++ b/ldap/admin/src/init_ds_env.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 /*
  * Set up environment for CGIs.
  * 
diff --git a/ldap/admin/src/install_keywords.h b/ldap/admin/src/install_keywords.h
index 56856614..9106a1cf 100644
--- a/ldap/admin/src/install_keywords.h
+++ b/ldap/admin/src/install_keywords.h
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 /*********************************************************************
 **
 **
diff --git a/ldap/admin/src/instindex.cpp b/ldap/admin/src/instindex.cpp
index 83ebe45a..05c3fbee 100644
--- a/ldap/admin/src/instindex.cpp
+++ b/ldap/admin/src/instindex.cpp
@@ -35,6 +35,11 @@
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 /*
  * index.c: Shows the first page you see on install
  * 
diff --git a/ldap/admin/src/latest_file.c b/ldap/admin/src/latest_file.c
index df1d6dd2..7e38b368 100644
--- a/ldap/admin/src/latest_file.c
+++ b/ldap/admin/src/latest_file.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
+
 /***********************************************************************
 **
 ** NAME
diff --git a/ldap/admin/src/namegen.c b/ldap/admin/src/namegen.c
index 5e36c15b..c35c3eda 100644
--- a/ldap/admin/src/namegen.c
+++ b/ldap/admin/src/namegen.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
+
 /* namegen.c - utility program to generate name *
  * of backup files in the format YYYY_MM_DD_HMS *
  * and set it up as an environment variable to  *
diff --git a/ldap/admin/src/restart.c b/ldap/admin/src/restart.c
index fec805fb..e45676e7 100644
--- a/ldap/admin/src/restart.c
+++ b/ldap/admin/src/restart.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
+
 /*
  * restart.c:  Stops and the starts up the server.
  * 
diff --git a/ldap/admin/src/script-gen.c b/ldap/admin/src/script-gen.c
index cac07884..0b17eb03 100644
--- a/ldap/admin/src/script-gen.c
+++ b/ldap/admin/src/script-gen.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
+
 /*
  * this is used for generating the (large) scripts during create_instance.
  */
diff --git a/ldap/admin/src/shutdown.c b/ldap/admin/src/shutdown.c
index 14e6d86a..a1c98a5d 100644
--- a/ldap/admin/src/shutdown.c
+++ b/ldap/admin/src/shutdown.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
+
 /*
  * shutdown.c:  Kills the server.
  * 
diff --git a/ldap/admin/src/start.c b/ldap/admin/src/start.c
index 63194fe3..1765ab0c 100644
--- a/ldap/admin/src/start.c
+++ b/ldap/admin/src/start.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
+
 /*
  * start.c:  Starts up the server.
  * 
diff --git a/ldap/admin/src/vlvindex.c b/ldap/admin/src/vlvindex.c
index 426c6925..6eb8c1a9 100644
--- a/ldap/admin/src/vlvindex.c
+++ b/ldap/admin/src/vlvindex.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
+
 /*
  * vlvindex.c:  Creates a VLV index for a given search
  *