Use new dynconfig.h location.

diff --git a/source/lib/charset/util_unistr.c b/source/lib/charset/util_unistr.c
index c496c5d905085986c3b57dd3555f2a4b93aeb3a1..19a4f3236cfdedcdc5cffe9541d7b9cb427021c8 100644 (file)
--- a/source/lib/charset/util_unistr.c
+++ b/source/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/source/lib/cmdline/popt_common.c b/source/lib/cmdline/popt_common.c
index 73b3eecfbfee0aad97d3cbbd61441212d3d31441..96d8b8b40a1a7937490c0baa9fc8eaaad11e933c 100644 (file)
--- a/source/lib/cmdline/popt_common.c
+++ b/source/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/source/lib/ldb/config.mk b/source/lib/ldb/config.mk
index d63b4407887b701a354b183cc9395e7f542863db..cc8f1e36ab84da20cccbdab4d98ba09ab7c492cf 100644 (file)
--- a/source/lib/ldb/config.mk
+++ b/source/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/source/lib/util/debug.c b/source/lib/util/debug.c
index 5c1abf5039cdae741547abccf190558905f7f90a..00dcbfc8bdbeba71fa312245aa21f85e31e01a79 100644 (file)
--- a/source/lib/util/debug.c
+++ b/source/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/source/nsswitch/wbinfo.c b/source/nsswitch/wbinfo.c
index 7ead27939ec9a26fd93284a625240917c4bbc4a2..21c178cc7bb2498aee5c01fe883cf2b2bc878f52 100644 (file)
--- a/source/nsswitch/wbinfo.c
+++ b/source/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/source/param/loadparm.c b/source/param/loadparm.c
index 812162e1707381637aef79be14e8a7157a971c4b..b70e4c19f0fe3ae6997d82a69da3f719cab232dc 100644 (file)
--- a/source/param/loadparm.c
+++ b/source/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/source/param/util.c b/source/param/util.c
index 2baaefda8b351e51e0d63b02cfcdb3b61bd48809..15e3b4768ceb5ebe094bbd599be38174b4aee09b 100644 (file)
--- a/source/param/util.c
+++ b/source/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/source/scripting/ejs/smbscript.c b/source/scripting/ejs/smbscript.c
index 9ed4aa490f3b78eea0793ffc5fa128a6e33dcbec..db9fc9affa01c77fd2d47fa2fa1bef7bb2e31ecb 100644 (file)
--- a/source/scripting/ejs/smbscript.c
+++ b/source/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/source/torture/gentest.c b/source/torture/gentest.c
index ae18fe809c93e55753b52ad8ac2a34408a3c8609..cd33074b4f268251ae3a05e3c4870b07de154ff7 100644 (file)
--- a/source/torture/gentest.c
+++ b/source/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/source/torture/gentest_smb2.c b/source/torture/gentest_smb2.c
index 428f325a76d8c4dc666a5404a58ee52e73046fc4..3e705dc60d3709f52901a02f14493cf79b5f9565 100644 (file)
--- a/source/torture/gentest_smb2.c
+++ b/source/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/source/torture/locktest.c b/source/torture/locktest.c
index 8959232edb6149d8c6f033dbeb0a0c3bb83c3853..4a0dfc2a6f10eff20ff35e3c97eafed02f012bcc 100644 (file)
--- a/source/torture/locktest.c
+++ b/source/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/source/torture/masktest.c b/source/torture/masktest.c
index 39b1296dbe0da573afcc2a3e9e6717a90778e527..255d94382c207eecf8de6b15e08f6483ff352a7a 100644 (file)
--- a/source/torture/masktest.c
+++ b/source/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/source/torture/smbtorture.c b/source/torture/smbtorture.c
index 44daa89e4420f0ee4b1cbbca8bd6ee81177de335..e1e84247b4b73491727c1394d6830c2e7548f45f 100644 (file)
--- a/source/torture/smbtorture.c
+++ b/source/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"