lib/addns: move DNS client library to the main directory.

Guenther
(cherry picked from commit 7ee75c95481f0d13598577361d18e96cb8394b9c)

diff --git a/source3/libaddns/addns.h b/lib/addns/addns.h
similarity index 100%
rename from source3/libaddns/addns.h
rename to lib/addns/addns.h

diff --git a/source3/libaddns/dns.h b/lib/addns/dns.h
similarity index 100%
rename from source3/libaddns/dns.h
rename to lib/addns/dns.h

diff --git a/source3/libaddns/dnserr.h b/lib/addns/dnserr.h
similarity index 100%
rename from source3/libaddns/dnserr.h
rename to lib/addns/dnserr.h

diff --git a/source3/libaddns/dnsgss.c b/lib/addns/dnsgss.c
similarity index 100%
rename from source3/libaddns/dnsgss.c
rename to lib/addns/dnsgss.c

diff --git a/source3/libaddns/dnsmarshall.c b/lib/addns/dnsmarshall.c
similarity index 100%
rename from source3/libaddns/dnsmarshall.c
rename to lib/addns/dnsmarshall.c

diff --git a/source3/libaddns/dnsrecord.c b/lib/addns/dnsrecord.c
similarity index 100%
rename from source3/libaddns/dnsrecord.c
rename to lib/addns/dnsrecord.c

diff --git a/source3/libaddns/dnssock.c b/lib/addns/dnssock.c
similarity index 100%
rename from source3/libaddns/dnssock.c
rename to lib/addns/dnssock.c

diff --git a/source3/libaddns/dnsutils.c b/lib/addns/dnsutils.c
similarity index 100%
rename from source3/libaddns/dnsutils.c
rename to lib/addns/dnsutils.c

diff --git a/source3/libaddns/error.c b/lib/addns/error.c
similarity index 100%
rename from source3/libaddns/error.c
rename to lib/addns/error.c

diff --git a/source3/libaddns/wscript_build b/lib/addns/wscript_build
similarity index 100%
rename from source3/libaddns/wscript_build
rename to lib/addns/wscript_build

diff --git a/source3/Makefile.in b/source3/Makefile.in
index cfcadce4cf0bd579a15ef0f7472f32860ff5cf0a..376a2f125c1930958b73c4fb9d802acbdc823d3d 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -492,8 +492,8 @@ PARAM_OBJ = $(PARAM_WITHOUT_REG_OBJ) $(PARAM_REG_ADD_OBJ)
 
 KRBCLIENT_OBJ = libads/kerberos.o libads/ads_status.o
 
-LIBADDNS_OBJ0 = libaddns/dnsrecord.o libaddns/dnsutils.o  libaddns/dnssock.o \
-              libaddns/dnsgss.o libaddns/dnsmarshall.o libaddns/error.o
+LIBADDNS_OBJ0 = ../lib/addns/dnsrecord.o ../lib/addns/dnsutils.o  ../lib/addns/dnssock.o \
+              ../lib/addns/dnsgss.o ../lib/addns/dnsmarshall.o ../lib/addns/error.o
 LIBADDNS_OBJ = $(LIBADDNS_OBJ0) $(SOCKET_WRAPPER_OBJ)
 
 GPEXT_OBJ = ../libgpo/gpext/gpext.o @GPEXT_STATIC@
@@ -2246,7 +2246,7 @@ LIBADDNS_SHARED_TARGET_SONAME=$(LIBADDNS_SHARED_TARGET).$(LIBADDNS_SOVER)
 LIBADDNS_STATIC_TARGET=@LIBADDNS_STATIC_TARGET@
 LIBADDNS=@LIBADDNS_STATIC@ @LIBADDNS_SHARED@
 #LIBADDNS_SYMS=$(srcdir)/exports/libaddns.@SYMSEXT@
-LIBADDNS_HEADERS=$(srcdir)/libaddns/addns.h
+LIBADDNS_HEADERS=$(srcdir)/../lib/addns/addns.h
 
 $(LIBADDNS_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBADDNS_OBJ) $(LIBTALLOC)
        @echo Linking shared library $@

diff --git a/source3/configure.in b/source3/configure.in
index ac43308c1ca7b8568c871600cd71b1d260e92219..f565fdb9922aed0acd64a18e0da4413acf6c82ff 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -37,7 +37,7 @@ 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-.}/libaddns"
+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/wscript_build b/source3/wscript_build
index af7c6cbea0a502944766158b7252194b30b2023a..5fa52965839490d0cb2c101952eb2666ae6ad620 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1493,6 +1493,7 @@ bld.RECURSE('../lib/tsocket')
 bld.RECURSE('../lib/iniparser/src')
 bld.RECURSE('../lib/crypto')
 bld.RECURSE('../lib/async_req')
+bld.RECURSE('../lib/addns')
 bld.RECURSE('../libcli/auth')
 bld.RECURSE('../libcli/drsuapi')
 bld.RECURSE('../libcli/samsync')
@@ -1507,7 +1508,6 @@ bld.RECURSE('winbindd')
 bld.RECURSE('libgpo/gpext')
 bld.RECURSE('pam_smbpass')
 bld.RECURSE('rpc_server')
-bld.RECURSE('libaddns')
 
 bld.ENFORCE_GROUP_ORDERING()
 bld.CHECK_PROJECT_RULES()