summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--source4/client/config.mk4
-rw-r--r--source4/configure.ac2
-rw-r--r--source4/heimdal_build/config.mk2
-rw-r--r--source4/ldap_server/config.mk2
-rw-r--r--source4/lib/policy/config.mk4
-rw-r--r--source4/lib/registry/config.mk8
-rw-r--r--source4/lib/tls/config.mk2
-rw-r--r--source4/libcli/auth/config.mk2
-rw-r--r--source4/libcli/config.mk6
-rw-r--r--source4/librpc/config.mk6
-rw-r--r--source4/nbt_server/config.mk2
-rw-r--r--source4/nsswitch/config.mk2
-rw-r--r--source4/param/config.mk4
-rw-r--r--source4/param/samba-hostconfig.pc.in (renamed from source4/param/samba-config.pc.in)6
-rw-r--r--source4/scripting/ejs/config.mk2
-rw-r--r--source4/smbd/config.mk2
-rw-r--r--source4/smbd/process_model.mk2
-rw-r--r--source4/torture/config.mk8
-rw-r--r--source4/utils/config.mk8
-rw-r--r--source4/utils/net/config.mk2
20 files changed, 38 insertions, 38 deletions
diff --git a/source4/client/config.mk b/source4/client/config.mk
index 9f785004a0..2085faf61e 100644
--- 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 41f1bcf054..0e264d3474 100644
--- 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 65b49b73db..24d50acb05 100644
--- 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 9892376821..5f8c530db9 100644
--- 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 aae98b86b2..6763884b48 100644
--- 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 b2d7ce202e..70ffce020a 100644
--- 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 f75c613e73..8e8330f709 100644
--- 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 61d3fe8c94..f786c71469 100644
--- 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 d3a3beaaa9..0aa67f35db 100644
--- 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 a316e059b3..4bbce62482 100644
--- 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 9285044768..b510a6e2d6 100644
--- 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 e53e064272..c7c70c141e 100644
--- 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 59b3fd5f9a..69e3d65434 100644
--- 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
index 801f6aeda4..b8ba24096d 100644
--- 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 c1f07367fb..33a4ac915f 100644
--- 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 2482780756..6cbfa16045 100644
--- 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 5201a2e46e..d559ce1577 100644
--- 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 e35a26e49f..1d09d74f99 100644
--- 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 9ebfbbb7e3..9dea2c5af3 100644
--- 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 c07d6a67cb..ced0710ae0 100644
--- 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 \
generated by cgit (git 2.34.1) at 2024-11-23 04:36:14 +0000