Rename libsamba-config to libsamba-hostconfig.

(This used to be commit c46b7e90e347da76156ddcae4866adb88e9fec21)

diff --git a/source4/client/config.mk b/source4/client/config.mk
index 9f785004a0163c2d00867db9d36ec0b8c57cd941..2085faf61e7e3b128989db44cb2bd2a31975fac8 100644 (file)
--- a/source4/client/config.mk
+++ b/source4/client/config.mk
@@ -7,7 +7,7 @@ INSTALLDIR = BINDIR
 OBJ_FILES = \
                client.o
 PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG \
+               LIBSAMBA-HOSTCONFIG \
                SMBREADLINE \
                LIBSAMBA-UTIL \
                LIBCLI_SMB \
@@ -28,7 +28,7 @@ OBJ_FILES = \
                cifsdd.o \
                cifsddio.o
 PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG \
+               LIBSAMBA-HOSTCONFIG \
                LIBCLI_SMB \
                LIBPOPT \
                POPT_SAMBA \

diff --git a/source4/configure.ac b/source4/configure.ac
index 41f1bcf054b5fea72d3437d6270882e48e54f866..0e264d3474c4b5ec1a7c209e57a57b5449bb8e00 100644 (file)
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -32,7 +32,7 @@ AC_CONFIG_FILES(librpc/dcerpc.pc)
 AC_CONFIG_FILES(librpc/ndr.pc)
 AC_CONFIG_FILES(torture/torture.pc)
 AC_CONFIG_FILES(auth/gensec/gensec.pc)
-AC_CONFIG_FILES(param/samba-config.pc)
+AC_CONFIG_FILES(param/samba-hostconfig.pc)
 AC_CONFIG_FILES(librpc/dcerpc_samr.pc)
 
 SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.2.0,

diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index 65b49b73dbd496820c5eb427482b9b9618af500b..24d50acb056f0aa05f252c56c46699aa99603710 100644 (file)
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -452,7 +452,7 @@ PUBLIC_DEPENDENCIES = \
 [SUBSYSTEM::HEIMDAL_GLUE]
 CFLAGS = -Iheimdal_build -Iheimdal/lib/krb5 -Iheimdal/lib/asn1 -Iheimdal/lib/com_err 
 OBJ_FILES = glue.o
-PUBLIC_DEPENDENCIES = LIBNETIF LIBSAMBA-CONFIG
+PUBLIC_DEPENDENCIES = LIBNETIF LIBSAMBA-HOSTCONFIG
 # End SUBSYSTEM HEIMDAL_GLUE
 #######################
 

diff --git a/source4/ldap_server/config.mk b/source4/ldap_server/config.mk
index 989237682156563b8e00a8b5015346e8acfbd762..5f8c530db939149f697c422d22052976af05bf1b 100644 (file)
--- a/source4/ldap_server/config.mk
+++ b/source4/ldap_server/config.mk
@@ -15,6 +15,6 @@ PRIVATE_DEPENDENCIES = CREDENTIALS \
                LIBCLI_LDAP SAMDB \
                process_model \
                gensec \
-               LIBSAMBA-CONFIG
+               LIBSAMBA-HOSTCONFIG
 # End SUBSYSTEM SMB
 #######################

diff --git a/source4/lib/policy/config.mk b/source4/lib/policy/config.mk
index aae98b86b2e899c0c4abea7954ddc2f23a7e3cb6..6763884b48571c1bb9e6910b9a8f7ec0c9c003bd 100644 (file)
--- a/source4/lib/policy/config.mk
+++ b/source4/lib/policy/config.mk
@@ -1,7 +1,7 @@
 [SUBSYSTEM::LIBPOLICY]
 CFLAGS = -Iheimdal/lib/roken
 OBJ_FILES = lex.o parse_adm.o 
-PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-CONFIG LIBTALLOC CHARSET 
+PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG LIBTALLOC CHARSET 
 
 lib/policy/lex.l: lib/policy/parse_adm.h
 
@@ -9,4 +9,4 @@ lib/policy/parse_adm.h: lib/policy/parse_adm.c
 
 [BINARY::dumpadm]
 OBJ_FILES = dumpadm.o
-PRIVATE_DEPENDENCIES = LIBPOLICY LIBPOPT LIBSAMBA-CONFIG LIBTALLOC LIBSAMBA-UTIL CHARSET
+PRIVATE_DEPENDENCIES = LIBPOLICY LIBPOPT LIBSAMBA-HOSTCONFIG LIBTALLOC LIBSAMBA-UTIL CHARSET

diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index b2d7ce202e44672d0ad3c97de09452c1baa714e4..70ffce020aaa637aca49cd16d4eb59eda4ac6c29 100644 (file)
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -52,7 +52,7 @@ PRIVATE_PROTO_HEADER = tools/common.h
 INSTALLDIR = BINDIR
 OBJ_FILES = tools/regdiff.o
 PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS
+               LIBSAMBA-HOSTCONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS
 # End BINARY regdiff
 ################################################
 
@@ -64,7 +64,7 @@ MANPAGES += lib/registry/man/regdiff.1
 INSTALLDIR = BINDIR
 OBJ_FILES = tools/regpatch.o
 PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS \
+               LIBSAMBA-HOSTCONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS \
                registry_common
 # End BINARY regpatch
 ################################################
@@ -77,7 +77,7 @@ MANPAGES += lib/registry/man/regpatch.1
 INSTALLDIR = BINDIR
 OBJ_FILES = tools/regshell.o
 PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS \
+               LIBSAMBA-HOSTCONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS \
                SMBREADLINE registry_common
 # End BINARY regshell
 ################################################
@@ -90,7 +90,7 @@ MANPAGES += lib/registry/man/regshell.1
 INSTALLDIR = BINDIR
 OBJ_FILES = tools/regtree.o
 PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS \
+               LIBSAMBA-HOSTCONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS \
                registry_common
 # End BINARY regtree
 ################################################

diff --git a/source4/lib/tls/config.mk b/source4/lib/tls/config.mk
index f75c613e731a55a83871ecd49a5a02a8b6a508c2..8e8330f709ec3e807a0e84a74997818ce9eb1c0e 100644 (file)
--- a/source4/lib/tls/config.mk
+++ b/source4/lib/tls/config.mk
@@ -5,7 +5,7 @@ OBJ_FILES = \
                tls.o \
                tlscert.o
 PUBLIC_DEPENDENCIES = \
-               LIBTALLOC GNUTLS LIBSAMBA-CONFIG samba-socket
+               LIBTALLOC GNUTLS LIBSAMBA-HOSTCONFIG samba-socket
 #
 # End SUBSYSTEM LIBTLS
 ################################################

diff --git a/source4/libcli/auth/config.mk b/source4/libcli/auth/config.mk
index 61d3fe8c9451c7f963c29eedd72fafb0b377f7c3..f786c71469aa9fc2516ae96d968c383e4f00155a 100644 (file)
--- a/source4/libcli/auth/config.mk
+++ b/source4/libcli/auth/config.mk
@@ -8,7 +8,7 @@ OBJ_FILES = credentials.o \
                smbdes.o
 PUBLIC_DEPENDENCIES = \
                MSRPC_PARSE \
-               LIBSAMBA-CONFIG
+               LIBSAMBA-HOSTCONFIG
 # End SUBSYSTEM LIBCLI_AUTH
 #################################
 

diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index d3a3beaaa980a5669b0e427511aeb5f2bc56042a..0aa67f35dbe2389cf0a15f542f53958f979d8aac 100644 (file)
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -53,11 +53,11 @@ PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT LIBCLI_COMPOSITE LIBEVENTS \
 
 [PYTHON::python_libcli_nbt]
 SWIG_FILE = swig/libcli_nbt.i
-PUBLIC_DEPENDENCIES = LIBCLI_NBT DYNCONFIG LIBSAMBA-CONFIG
+PUBLIC_DEPENDENCIES = LIBCLI_NBT DYNCONFIG LIBSAMBA-HOSTCONFIG
 
 [PYTHON::python_libcli_smb]
 SWIG_FILE = swig/libcli_smb.i
-PUBLIC_DEPENDENCIES = LIBCLI_SMB DYNCONFIG LIBSAMBA-CONFIG
+PUBLIC_DEPENDENCIES = LIBCLI_SMB DYNCONFIG LIBSAMBA-HOSTCONFIG
 
 [SUBSYSTEM::LIBCLI_DGRAM]
 OBJ_FILES = \
@@ -96,7 +96,7 @@ OBJ_FILES = \
        resolve/wins.o \
        resolve/host.o \
        resolve/resolve_lp.o
-PRIVATE_DEPENDENCIES = LIBCLI_NBT LIBSAMBA-CONFIG LIBNETIF 
+PRIVATE_DEPENDENCIES = LIBCLI_NBT LIBSAMBA-HOSTCONFIG LIBNETIF 
 
 [SUBSYSTEM::LIBCLI_FINDDCS]
 PRIVATE_PROTO_HEADER = finddcs.h

diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index a316e059b3da8f01f9cbbb0ea2e6fc04f0e790ff..4bbce6248238c4e97eedbd6e0553357f87ad05c7 100644 (file)
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -11,7 +11,7 @@ OBJ_FILES = \
                ndr/ndr_string.o \
                ndr/uuid.o
 PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTALLOC LIBSAMBA-UTIL CHARSET \
-                                         LIBSAMBA-CONFIG
+                                         LIBSAMBA-HOSTCONFIG
 # End SUBSYSTEM LIBNDR
 ################################################
 
@@ -24,7 +24,7 @@ INSTALLDIR = BINDIR
 OBJ_FILES = \
                tools/ndrdump.o
 PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG \
+               LIBSAMBA-HOSTCONFIG \
                LIBSAMBA-UTIL \
                LIBPOPT \
                POPT_SAMBA \
@@ -606,7 +606,7 @@ PRIVATE_DEPENDENCIES = dcerpc NDR_IRPC EJSRPC
 
 [PYTHON::swig_dcerpc]
 SWIG_FILE = rpc/dcerpc.i
-PUBLIC_DEPENDENCIES = LIBCLI_SMB NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG dcerpc_samr RPC_NDR_LSA DYNCONFIG
+PUBLIC_DEPENDENCIES = LIBCLI_SMB NDR_MISC LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG dcerpc_samr RPC_NDR_LSA DYNCONFIG
 
 [PYTHON::python_echo]
 OBJ_FILES = gen_ndr/py_echo.o

diff --git a/source4/nbt_server/config.mk b/source4/nbt_server/config.mk
index 928504476885999bce7e9b6c60c1ffcdc364aa24..b510a6e2d68f85f255fa288490b1d633f8a031e8 100644 (file)
--- a/source4/nbt_server/config.mk
+++ b/source4/nbt_server/config.mk
@@ -21,7 +21,7 @@ INIT_FUNCTION = &ldb_wins_ldb_module_ops
 OBJ_FILES = \
                wins/wins_ldb.o
 PRIVATE_DEPENDENCIES = \
-               LIBNETIF LIBSAMBA-CONFIG LIBSAMBA-UTIL
+               LIBNETIF LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL
 # End MODULE ldb_wins_ldb
 #######################
 

diff --git a/source4/nsswitch/config.mk b/source4/nsswitch/config.mk
index e53e0642721f12db71cb47604b31fea85009339f..c7c70c141ea9d82d58e3c66759a1f72b18cb525c 100644 (file)
--- a/source4/nsswitch/config.mk
+++ b/source4/nsswitch/config.mk
@@ -11,7 +11,7 @@ OBJ_FILES = \
 PRIVATE_DEPENDENCIES = \
                LIBSAMBA-UTIL \
                LIBREPLACE_EXT \
-               LIBSAMBA-CONFIG
+               LIBSAMBA-HOSTCONFIG
 # End BINARY nsstest
 #################################
 

diff --git a/source4/param/config.mk b/source4/param/config.mk
index 59b3fd5f9a99cd3e7df3f883976d4135aa73dc0d..69e3d654346d5b24766648451849114876721188 100644 (file)
--- a/source4/param/config.mk
+++ b/source4/param/config.mk
@@ -1,4 +1,4 @@
-[SUBSYSTEM::LIBSAMBA-CONFIG]
+[SUBSYSTEM::LIBSAMBA-HOSTCONFIG]
 OBJ_FILES = loadparm.o \
                        generic.o \
                        util.o \
@@ -46,4 +46,4 @@ PRIVATE_DEPENDENCIES = LIBLDB TDB_WRAP UTIL_TDB NDR_SECURITY
 
 [PYTHON::param]
 SWIG_FILE = param.i
-PRIVATE_DEPENDENCIES = LIBSAMBA-CONFIG
+PRIVATE_DEPENDENCIES = LIBSAMBA-HOSTCONFIG

diff --git a/source4/param/samba-config.pc.in b/source4/param/samba-hostconfig.pc.in
similarity index 59%
rename from source4/param/samba-config.pc.in
rename to source4/param/samba-hostconfig.pc.in
index 801f6aeda47ae8669e47e079a95d88f6080fc1eb..b8ba24096df51029f727dcc3cc6437c48efe35e1 100644 (file)
--- a/source4/param/samba-config.pc.in
+++ b/source4/param/samba-hostconfig.pc.in
@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: samba-config
-Description: Reading Samba configuration files
+Name: samba-hostconfig
+Description: Host-wide Samba configuration
 Version: 0.0.1
-Libs: -L${libdir} -lsamba-config 
+Libs: -L${libdir} -lsamba-hostconfig 
 Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index c1f07367fb7f6343f0e434564f1d7ead3ae0b7fd..33a4ac915f79adebefa6212ea9c82a06a7f73cc1 100644 (file)
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -93,6 +93,6 @@ PRIVATE_DEPENDENCIES = \
 INSTALLDIR = BINDIR
 OBJ_FILES = \
                smbscript.o
-PRIVATE_DEPENDENCIES = EJS LIBSAMBA-UTIL smbcalls LIBSAMBA-CONFIG
+PRIVATE_DEPENDENCIES = EJS LIBSAMBA-UTIL smbcalls LIBSAMBA-HOSTCONFIG
 # End BINARY SMBSCRIPT
 #######################

diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk
index 24827807562e6e073dafcb96bec0da792123da0a..6cbfa160459c052aea873a435e2a6690de341f45 100644 (file)
--- a/source4/smbd/config.mk
+++ b/source4/smbd/config.mk
@@ -32,7 +32,7 @@ OBJ_FILES = \
 PRIVATE_DEPENDENCIES = \
                process_model \
                service \
-               LIBSAMBA-CONFIG \
+               LIBSAMBA-HOSTCONFIG \
                LIBSAMBA-UTIL \
                POPT_SAMBA \
                PIDFILE \

diff --git a/source4/smbd/process_model.mk b/source4/smbd/process_model.mk
index 5201a2e46e1676a8eac755b2d596468be96db606..d559ce157715360a1f56ddbdb186b37b04d7b04d 100644 (file)
--- a/source4/smbd/process_model.mk
+++ b/source4/smbd/process_model.mk
@@ -46,4 +46,4 @@ OBJ_FILES = \
 PRIVATE_PROTO_HEADER = process_model_proto.h
 OBJ_FILES = \
                process_model.o
-PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-CONFIG
+PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG

diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index e35a26e49f954f338680d8edfe7846dc9b53bcf0..1d09d74f99601753564151afb44b124996b37a8f 100644 (file)
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -8,7 +8,7 @@ OBJ_FILES = \
                torture.o \
                ui.o
 PUBLIC_DEPENDENCIES = \
-               LIBSAMBA-CONFIG \
+               LIBSAMBA-HOSTCONFIG \
                LIBSAMBA-UTIL \
                LIBTALLOC \
                LIBPOPT
@@ -327,7 +327,7 @@ INSTALLDIR = BINDIR
 OBJ_FILES = \
                gentest.o
 PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG \
+               LIBSAMBA-HOSTCONFIG \
                LIBSAMBA-UTIL \
                LIBPOPT \
                POPT_SAMBA \
@@ -346,7 +346,7 @@ INSTALLDIR = BINDIR
 OBJ_FILES = \
                masktest.o
 PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG \
+               LIBSAMBA-HOSTCONFIG \
                LIBSAMBA-UTIL \
                LIBPOPT \
                POPT_SAMBA \
@@ -369,7 +369,7 @@ PRIVATE_DEPENDENCIES = \
                POPT_CREDENTIALS \
                LIBSAMBA-UTIL \
                LIBCLI_SMB \
-               LIBSAMBA-CONFIG
+               LIBSAMBA-HOSTCONFIG
 # End BINARY locktest
 #################################
 

diff --git a/source4/utils/config.mk b/source4/utils/config.mk
index 9ebfbbb7e3fdc8da053a2d9e914e378d32ba449d..9dea2c5af3a0fb3f591433860595cf0d93725b45 100644 (file)
--- a/source4/utils/config.mk
+++ b/source4/utils/config.mk
@@ -7,7 +7,7 @@ INSTALLDIR = BINDIR
 OBJ_FILES = \
                ntlm_auth.o
 PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG \
+               LIBSAMBA-HOSTCONFIG \
                LIBSAMBA-UTIL \
                LIBPOPT \
                POPT_SAMBA \
@@ -29,7 +29,7 @@ INSTALLDIR = BINDIR
 OBJ_FILES = \
                getntacl.o
 PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG \
+               LIBSAMBA-HOSTCONFIG \
                LIBSAMBA-UTIL \
                NDR_XATTR \
                WRAP_XATTR \
@@ -67,7 +67,7 @@ INSTALLDIR = BINDIR
 OBJ_FILES = \
                nmblookup.o
 PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG \
+               LIBSAMBA-HOSTCONFIG \
                LIBSAMBA-UTIL \
                LIBCLI_NBT \
                LIBPOPT \
@@ -84,7 +84,7 @@ INSTALLDIR = BINDIR
 OBJ_FILES = \
                testparm.o
 PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG \
+               LIBSAMBA-HOSTCONFIG \
                LIBSAMBA-UTIL \
                LIBPOPT \
                samba-socket \

diff --git a/source4/utils/net/config.mk b/source4/utils/net/config.mk
index c07d6a67cb58e8a2ca3ebd6297b9520d523a2f00..ced0710ae07b0e80b0fdaebf526a7bcf251c77ab 100644 (file)
--- a/source4/utils/net/config.mk
+++ b/source4/utils/net/config.mk
@@ -13,7 +13,7 @@ OBJ_FILES = \
                net_vampire.o \
                net_user.o
 PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG \
+               LIBSAMBA-HOSTCONFIG \
                LIBSAMBA-UTIL \
                LIBSAMBA-NET \
                LIBPOPT \