Use new dynconfig.h location.

(This used to be commit c3f556915f09d078253e4c5539910a1cf420eeca)

13 files changed, 14 insertions, 12 deletions

diff --git a/source4/lib/charset/util_unistr.c b/source4/lib/charset/util_unistr.c
index c496c5d905..19a4f3236c 100644
--- a/source4/lib/charset/util_unistr.c
+++ b/source4/lib/charset/util_unistr.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "system/locale.h"
-#include "dynconfig.h"
+#include "dynconfig/dynconfig.h"
 #include "param/param.h"
 
 /**
diff --git a/source4/lib/cmdline/popt_common.c b/source4/lib/cmdline/popt_common.c
index 73b3eecfbf..96d8b8b40a 100644
--- a/source4/lib/cmdline/popt_common.c
+++ b/source4/lib/cmdline/popt_common.c
@@ -23,7 +23,7 @@
 #include "version.h"
 #include "lib/cmdline/popt_common.h"
 #include "param/param.h"
-#include "dynconfig.h"
+#include "dynconfig/dynconfig.h"
 
 /* Handle command line options:
  *		-d,--debuglevel 
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index d63b440788..cc8f1e36ab 100644
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -130,6 +130,8 @@ LIBLDB_SOVERSION = 0
 
 LIBLDB_OBJ_FILES = $(addprefix $(ldbdir)/common/, ldb.o ldb_ldif.o ldb_parse.o ldb_msg.o ldb_utf8.o ldb_debug.o ldb_modules.o ldb_match.o ldb_attributes.o attrib_handlers.o ldb_dn.o ldb_controls.o qsort.o) $(ldb_map_OBJ_FILES)
 
+$(LIBLDB_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include
+
 PUBLIC_HEADERS += $(ldbdir)/include/ldb.h $(ldbdir)/include/ldb_errors.h
 
 MANPAGES += $(ldbdir)/man/ldb.3
diff --git a/source4/lib/util/debug.c b/source4/lib/util/debug.c
index 5c1abf5039..00dcbfc8bd 100644
--- a/source4/lib/util/debug.c
+++ b/source4/lib/util/debug.c
@@ -21,7 +21,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "system/time.h"
-#include "dynconfig.h"
+#include "dynconfig/dynconfig.h"
 
 /**
  * @file
diff --git a/source4/nsswitch/wbinfo.c b/source4/nsswitch/wbinfo.c
index 7ead27939e..21c178cc7b 100644
--- a/source4/nsswitch/wbinfo.c
+++ b/source4/nsswitch/wbinfo.c
@@ -27,7 +27,7 @@
 #include "libcli/auth/libcli_auth.h"
 #include "libcli/security/security.h"
 #include "lib/cmdline/popt_common.h"
-#include "dynconfig.h"
+#include "dynconfig/dynconfig.h"
 #include "param/param.h"
 
 extern int winbindd_fd;
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 812162e170..b70e4c19f0 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -54,7 +54,7 @@
 
 #include "includes.h"
 #include "version.h"
-#include "dynconfig.h"
+#include "dynconfig/dynconfig.h"
 #include "system/time.h"
 #include "system/locale.h"
 #include "system/network.h" /* needed for TCP_NODELAY */
diff --git a/source4/param/util.c b/source4/param/util.c
index 2baaefda8b..15e3b4768c 100644
--- a/source4/param/util.c
+++ b/source4/param/util.c
@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
-#include "dynconfig.h"
+#include "dynconfig/dynconfig.h"
 #include "system/network.h"
 #include "system/filesys.h"
 #include "system/dir.h"
diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 9ed4aa490f..db9fc9affa 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -26,7 +26,7 @@
 #include "scripting/ejs/smbcalls.h"
 #include "auth/gensec/gensec.h"
 #include "ldb/include/ldb.h"
-#include "dynconfig.h"
+#include "dynconfig/dynconfig.h"
 
 static EjsId eid;
 
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index ae18fe809c..cd33074b4f 100644
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -30,7 +30,7 @@
 #include "libcli/resolve/resolve.h"
 #include "auth/gensec/gensec.h"
 #include "param/param.h"
-#include "dynconfig.h"
+#include "dynconfig/dynconfig.h"
 
 #define NSERVERS 2
 #define NINSTANCES 2
diff --git a/source4/torture/gentest_smb2.c b/source4/torture/gentest_smb2.c
index 428f325a76..3e705dc60d 100644
--- a/source4/torture/gentest_smb2.c
+++ b/source4/torture/gentest_smb2.c
@@ -34,7 +34,7 @@
 #include "libcli/resolve/resolve.h"
 #include "auth/gensec/gensec.h"
 #include "param/param.h"
-#include "dynconfig.h"
+#include "dynconfig/dynconfig.h"
 
 #define NSERVERS 2
 #define NINSTANCES 2
diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c
index 8959232edb..4a0dfc2a6f 100644
--- a/source4/torture/locktest.c
+++ b/source4/torture/locktest.c
@@ -27,7 +27,7 @@
 #include "auth/gensec/gensec.h"
 #include "libcli/libcli.h"
 #include "param/param.h"
-#include "dynconfig.h"
+#include "dynconfig/dynconfig.h"
 #include "libcli/resolve/resolve.h"
 
 static int numops = 1000;
diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c
index 39b1296dbe..255d94382c 100644
--- a/source4/torture/masktest.c
+++ b/source4/torture/masktest.c
@@ -28,7 +28,7 @@
 #include "auth/credentials/credentials.h"
 #include "auth/gensec/gensec.h"
 #include "param/param.h"
-#include "dynconfig.h"
+#include "dynconfig/dynconfig.h"
 #include "libcli/resolve/resolve.h"
 #include "lib/events/events.h"
 
diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c
index 44daa89e44..e1e84247b4 100644
--- a/source4/torture/smbtorture.c
+++ b/source4/torture/smbtorture.c
@@ -28,7 +28,7 @@
 #include "libcli/libcli.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/events/events.h"
-#include "dynconfig.h"
+#include "dynconfig/dynconfig.h"
 
 #include "torture/smbtorture.h"
 #include "lib/util/dlinklist.h"