s3-build: remove -I../lib/addns.

Guenther

diff --git a/source3/.clang_complete b/source3/.clang_complete
index a13b5cdf35101841e3d9347ed484c01d979a7430..c3f2f30dd7db1fd92183dc4326d2e320075b290d 100644 (file)
--- a/source3/.clang_complete
+++ b/source3/.clang_complete
@@ -1,2 +1,2 @@
--I. -I./.. -Iinclude -I./../lib/replace -I./../lib/tevent -I./../lib/addns -I./librpc -I./../lib/talloc -I../lib/tdb/include
+-I. -I./.. -Iinclude -I./../lib/replace -I./../lib/tevent -I./librpc -I./../lib/talloc -I../lib/tdb/include
 -Iinclude/includes.h.gch

diff --git a/source3/configure.in b/source3/configure.in
index 8d32a1baca3b78999b7f4ec55b74d97b245fd37f..74df9d4836e9b084348eae301ca4634142e56f47 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -37,7 +37,6 @@ LIBS="${LIBS} ${TEVENT_LIBS}"
 SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include  -I. -I${srcdir-.}"
 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/replace"
 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TEVENT_CFLAGS}"
-SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/addns"
 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/.."
 

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 3ee47b3e60f3b1803da3529060c5e848a775d29c..e6ac1c9f86ef2feab111312ba538b20c10e4a452 100644 (file)
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -1121,7 +1121,7 @@ static WERROR check_ads_config( void )
 *******************************************************************/
 
 #if defined(WITH_DNS_UPDATES)
-#include "dns.h"
+#include "../lib/addns/dns.h"
 DNS_ERROR DoDNSUpdate(char *pszServerName,
                      const char *pszDomainName, const char *pszHostName,
                      const struct sockaddr_storage *sslist,

diff --git a/source3/utils/net_dns.c b/source3/utils/net_dns.c
index 61cb89d0f7b041ee566c06ec80f35f48b77b64ef..5fbdc0a70f35632af39117189149bdd0e8256e74 100644 (file)
--- a/source3/utils/net_dns.c
+++ b/source3/utils/net_dns.c
@@ -21,10 +21,9 @@
 
 #include "includes.h"
 #include "utils/net.h"
-#include "dns.h"
+#include "../lib/addns/dns.h"
 
 #if defined(WITH_DNS_UPDATES)
-
 /*
  * Silly prototype to get rid of a warning
  */