From af2538d16fdb8154dbb2d4720104a0fadfebf04f Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 4 Mar 2011 13:16:40 +0100 Subject: s3-build: remove -I../lib/addns. Guenther --- source3/.clang_complete | 2 +- source3/configure.in | 1 - source3/utils/net_ads.c | 2 +- source3/utils/net_dns.c | 3 +-- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/source3/.clang_complete b/source3/.clang_complete index a13b5cdf35..c3f2f30dd7 100644 --- 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 8d32a1baca..74df9d4836 100644 --- 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 3ee47b3e60..e6ac1c9f86 100644 --- 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 61cb89d0f7..5fbdc0a70f 100644 --- 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 */ -- cgit