Move common libraries from root to lib/.

7 files changed, 28 insertions, 28 deletions

diff --git a/source4/Makefile b/source4/Makefile
index 04f0ae94575..91390d833f8 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -62,7 +62,7 @@ libsrcdir := lib
 libsocketsrcdir := lib/socket
 libcharsetsrcdir := lib/charset
 ldb_sambasrcdir := lib/ldb-samba
-tdbsrcdir := ../tdb
+tdbsrcdir := ../lib/tdb
 ldbsrcdir := lib/ldb
 libtlssrcdir := lib/tls
 libregistrysrcdir := lib/registry
@@ -70,9 +70,9 @@ smbreadlinesrcdir := lib/smbreadline
 libmessagingsrcdir := lib/messaging
 libeventssrcdir := lib/events
 libcmdlinesrcdir := lib/cmdline
-poptsrcdir := ../popt
-socketwrappersrcdir := ../socket_wrapper
-nsswrappersrcdir := ../nss_wrapper
+poptsrcdir := ../lib/popt
+socketwrappersrcdir := ../lib/socket_wrapper
+nsswrappersrcdir := ../lib/nss_wrapper
 appwebsrcdir := lib/appweb
 libstreamsrcdir := lib/stream
 libutilsrcdir := lib/util
@@ -81,7 +81,7 @@ libdbwrapsrcdir := lib/dbwrap
 libcryptosrcdir := lib/crypto
 libtorturesrcdir := lib/torture
 smb_serversrcdir := smb_server
-libcompressionsrcdir := ../compression
+libcompressionsrcdir := ../lib/compression
 libgencachesrcdir := lib
 paramsrcdir := param
 rpc_serversrcdir := rpc_server
@@ -103,7 +103,7 @@ pyscriptsrcdir := $(srcdir)/scripting/python
 kdcsrcdir := kdc
 ntp_signdsrcdir := ntp_signd
 wmisrcdir := lib/wmi
-tallocsrcdir := ../talloc
+tallocsrcdir := ../lib/talloc
 
 include data.mk
 
diff --git a/source4/aclocal.m4 b/source4/aclocal.m4
index 0e75fa51f5f..240a994f9df 100644
--- a/source4/aclocal.m4
+++ b/source4/aclocal.m4
@@ -53,7 +53,7 @@ AC_DEFUN(LIB_REMOVE_USR_LIB,[
   $1=[$]ac_new_flags
 ])
 
-m4_include(../replace/libreplace.m4)
+m4_include(../lib/replace/libreplace.m4)
 m4_include(build/m4/ax_cflags_gcc_option.m4)
 m4_include(build/m4/ax_cflags_irix_option.m4)
 m4_include(build/m4/public.m4)
diff --git a/source4/autogen.sh b/source4/autogen.sh
index 89f5abeb96e..a56c5a22387 100755
--- a/source4/autogen.sh
+++ b/source4/autogen.sh
@@ -53,7 +53,7 @@ echo "$0: running script/mkversion.sh"
 rm -rf autom4te*.cache
 rm -f configure include/config_tmp.h*
 
-IPATHS="-I. -I../replace"
+IPATHS="-I. -I../lib/replace"
 
 echo "$0: running $AUTOHEADER $IPATHS"
 $AUTOHEADER $IPATHS || exit 1
diff --git a/source4/configure.ac b/source4/configure.ac
index 357121a43ba..099da400e73 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -11,7 +11,7 @@ AC_DEFINE(CONFIG_H_IS_FROM_SAMBA,1,[Marker for samba's config.h])
 
 # Configuration rules.
 m4_include(build/m4/env.m4)
-m4_include(../replace/samba.m4)
+m4_include(../lib/replace/samba.m4)
 m4_include(lib/smbreadline/readline.m4)
 m4_include(heimdal_build/config.m4)
 m4_include(lib/util/fault.m4)
@@ -21,7 +21,7 @@ m4_include(lib/util/fsusage.m4)
 m4_include(lib/util/xattr.m4)
 m4_include(lib/util/capability.m4)
 m4_include(lib/util/time.m4)
-m4_include(../popt/samba.m4)
+m4_include(../lib/popt/samba.m4)
 m4_include(lib/charset/config.m4)
 m4_include(lib/socket/config.m4)
 m4_include(lib/zlib.m4)
@@ -41,20 +41,20 @@ AC_CONFIG_FILES(librpc/dcerpc_atsvc.pc)
 SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.2.0,
 	[],
 	[
-		m4_include(../talloc/libtalloc.m4)
-		SMB_INCLUDE_MK(../talloc/config.mk)
+		m4_include(../lib/talloc/libtalloc.m4)
+		SMB_INCLUDE_MK(../lib/talloc/config.mk)
 	]
 )
 
 SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.0,
 	[],
 	[
-		m4_include(../tdb/libtdb.m4)
-		SMB_INCLUDE_MK(../tdb/config.mk)
+		m4_include(../lib/tdb/libtdb.m4)
+		SMB_INCLUDE_MK(../lib/tdb/config.mk)
 	]
 )
 
-SMB_INCLUDE_MK(../tdb/python.mk) 
+SMB_INCLUDE_MK(../lib/tdb/python.mk) 
 
 SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb >= 0.9.1,
 	[
@@ -99,8 +99,8 @@ m4_include(auth/gensec/config.m4)
 m4_include(smbd/process_model.m4)
 m4_include(ntvfs/posix/config.m4)
 m4_include(ntvfs/unixuid/config.m4)
-m4_include(../socket_wrapper/config.m4)
-m4_include(../nss_wrapper/config.m4)
+m4_include(../lib/socket_wrapper/config.m4)
+m4_include(../lib/nss_wrapper/config.m4)
 m4_include(auth/config.m4)
 m4_include(kdc/config.m4)
 m4_include(ntvfs/sysdep/config.m4)
@@ -159,7 +159,7 @@ then
 	builddir_headers="-I\$(builddir)/include -I\$(builddir) -I\$(builddir)/lib ";
 fi
 
-CPPFLAGS="$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -I\$(srcdir)/../replace -I\$(srcdir)/../talloc -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H $CPPFLAGS"
+CPPFLAGS="$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -I\$(srcdir)/../lib/replace -I\$(srcdir)/../lib/talloc -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H $CPPFLAGS"
 
 SMB_WRITE_PERLVARS(build/smb_build/config.pm)
 
diff --git a/source4/librpc/ndr/ndr_compression.c b/source4/librpc/ndr/ndr_compression.c
index 92c5b049df2..05a80e20b2c 100644
--- a/source4/librpc/ndr/ndr_compression.c
+++ b/source4/librpc/ndr/ndr_compression.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "lib/compression/lzxpress.h"
+#include "../lib/compression/lzxpress.h"
 #include "librpc/ndr/libndr.h"
 #include "librpc/ndr/ndr_compression.h"
 #include <zlib.h>
diff --git a/source4/main.mk b/source4/main.mk
index 5ab9f95c053..ddeb4baf2ec 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -16,8 +16,8 @@ mkinclude lib/registry/config.mk
 mkinclude lib/messaging/config.mk
 mkinclude lib/events/config.mk
 mkinclude lib/cmdline/config.mk
-mkinclude ../socket_wrapper/config.mk
-mkinclude ../nss_wrapper/config.mk
+mkinclude ../lib/socket_wrapper/config.mk
+mkinclude ../lib/nss_wrapper/config.mk
 mkinclude lib/appweb/config.mk
 mkinclude lib/stream/config.mk
 mkinclude lib/util/config.mk
diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
index 54cbdae837a..4cd9f6c865d 100644
--- a/source4/torture/local/config.mk
+++ b/source4/torture/local/config.mk
@@ -20,23 +20,23 @@ PRIVATE_DEPENDENCIES = \
 
 TORTURE_LOCAL_OBJ_FILES = \
 		$(torturesrcdir)/../lib/charset/tests/iconv.o \
-		$(torturesrcdir)/../../talloc/testsuite.o \
-		$(torturesrcdir)/../../replace/test/getifaddrs.o \
-		$(torturesrcdir)/../../replace/test/os2_delete.o \
-		$(torturesrcdir)/../../replace/test/strptime.o \
-		$(torturesrcdir)/../../replace/test/testsuite.o \
+		$(torturesrcdir)/../../lib/talloc/testsuite.o \
+		$(torturesrcdir)/../../lib/replace/test/getifaddrs.o \
+		$(torturesrcdir)/../../lib/replace/test/os2_delete.o \
+		$(torturesrcdir)/../../lib/replace/test/strptime.o \
+		$(torturesrcdir)/../../lib/replace/test/testsuite.o \
 		$(torturesrcdir)/../lib/messaging/tests/messaging.o \
 		$(torturesrcdir)/../lib/messaging/tests/irpc.o \
 		$(torturesrcdir)/../librpc/tests/binding_string.o \
 		$(torturesrcdir)/../lib/util/tests/idtree.o \
 		$(torturesrcdir)/../lib/socket/testsuite.o \
-		$(torturesrcdir)/../../socket_wrapper/testsuite.o \
+		$(torturesrcdir)/../../lib/socket_wrapper/testsuite.o \
 		$(torturesrcdir)/../libcli/resolve/testsuite.o \
 		$(torturesrcdir)/../lib/util/tests/strlist.o \
 		$(torturesrcdir)/../lib/util/tests/str.o \
 		$(torturesrcdir)/../lib/util/tests/file.o \
 		$(torturesrcdir)/../lib/util/tests/genrand.o \
-		$(torturesrcdir)/../../compression/testsuite.o \
+		$(torturesrcdir)/../../lib/compression/testsuite.o \
 		$(torturesrcdir)/../lib/charset/tests/charset.o \
 		$(torturesrcdir)/../libcli/security/tests/sddl.o \
 		$(torturesrcdir)/../lib/tdr/testsuite.o \