summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-05-01 12:54:36 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:05:28 -0500
commit6275553baee5593f9e13a0635755b2deb275c3be (patch)
treeeffa8d8e0d11e48dd31fb32fe0aa358882d09198
parentfe9312609694011d9201a3d07df2cde5a75eec05 (diff)
downloadsamba-6275553baee5593f9e13a0635755b2deb275c3be.tar.gz
samba-6275553baee5593f9e13a0635755b2deb275c3be.tar.bz2
samba-6275553baee5593f9e13a0635755b2deb275c3be.zip
r15373: Rename SOCKET to LIBSAMBA-SOCKET to prevent name clashes with -lsocket on SUN
boxes. (This used to be commit c95ad11307dc89384c10bd5919817bf12d9c1ed9)
-rw-r--r--source4/auth/kerberos/config.mk2
-rw-r--r--source4/heimdal_build/config.mk2
-rw-r--r--source4/lib/socket/config.mk8
-rw-r--r--source4/libcli/config.mk8
-rw-r--r--source4/libcli/ldap/config.mk2
-rw-r--r--source4/librpc/config.mk2
-rw-r--r--source4/utils/config.mk2
7 files changed, 13 insertions, 13 deletions
diff --git a/source4/auth/kerberos/config.mk b/source4/auth/kerberos/config.mk
index 4d6d07c743..16a1c5fc71 100644
--- a/source4/auth/kerberos/config.mk
+++ b/source4/auth/kerberos/config.mk
@@ -9,7 +9,7 @@ OBJ_FILES = kerberos.o \
kerberos_pac.o \
gssapi_parse.o \
krb5_init_context.o
-PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC SOCKET LIBCLI_RESOLVE
+PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC LIBSAMBA-SOCKET LIBCLI_RESOLVE
PRIVATE_DEPENDENCIES = ASN1_UTIL HEIMDAL_ROKEN_ADDRINFO auth_sam
# End SUBSYSTEM KERBEROS
#################################
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index dd5a241d59..be99f5bc24 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -320,7 +320,7 @@ OBJ_FILES = \
../heimdal/lib/roken/freehostent.o \
../heimdal/lib/roken/copyhostent.o \
../heimdal/lib/roken/hostent_find_fqdn.o
-PRIVATE_DEPENDENCIES = SOCKET
+PRIVATE_DEPENDENCIES = EXT_SOCKET
#######################
# Start SUBSYSTEM HEIMDAL_ROKEN
diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk
index 4c4dbb2915..d0b19e1ecf 100644
--- a/source4/lib/socket/config.mk
+++ b/source4/lib/socket/config.mk
@@ -2,7 +2,7 @@
################################################
# Start MODULE socket_ipv4
[MODULE::socket_ipv4]
-SUBSYSTEM = SOCKET
+SUBSYSTEM = LIBSAMBA-SOCKET
OUTPUT_TYPE = INTEGRATED
OBJ_FILES = \
socket_ipv4.o
@@ -14,7 +14,7 @@ PRIVATE_DEPENDENCIES = LIBSAMBA-ERRORS
################################################
# Start MODULE socket_ipv6
[MODULE::socket_ipv6]
-SUBSYSTEM = SOCKET
+SUBSYSTEM = LIBSAMBA-SOCKET
OUTPUT_TYPE = INTEGRATED
OBJ_FILES = \
socket_ipv6.o
@@ -25,7 +25,7 @@ PUBLIC_DEPENDENCIES = EXT_SOCKET
################################################
# Start MODULE socket_unix
[MODULE::socket_unix]
-SUBSYSTEM = SOCKET
+SUBSYSTEM = LIBSAMBA-SOCKET
OUTPUT_TYPE = INTEGRATED
OBJ_FILES = \
socket_unix.o
@@ -35,7 +35,7 @@ PUBLIC_DEPENDENCIES = EXT_SOCKET
################################################
# Start SUBSYSTEM SOCKET
-[SUBSYSTEM::SOCKET]
+[SUBSYSTEM::LIBSAMBA-SOCKET]
OBJ_FILES = \
socket.o \
access.o \
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index cc8ea52ed0..0e680215d3 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -54,7 +54,7 @@ OBJ_FILES = \
nbt/namerefresh.o \
nbt/namerelease.o
PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT LIBCLI_COMPOSITE LIBEVENTS \
- NDR_SECURITY SOCKET
+ NDR_SECURITY LIBSAMBA-SOCKET
[SUBSYSTEM::LIBCLI_DGRAM]
OBJ_FILES = \
@@ -80,7 +80,7 @@ SO_VERSION = 0
DESCRIPTION = WINS Replication client library
OBJ_FILES = \
wrepl/winsrepl.o
-PUBLIC_DEPENDENCIES = NDR_WINSREPL SOCKET LIBCLI_RESOLVE LIBEVENTS
+PUBLIC_DEPENDENCIES = NDR_WINSREPL LIBSAMBA-SOCKET LIBCLI_RESOLVE LIBEVENTS
[SUBSYSTEM::LIBCLI_RESOLVE]
PRIVATE_PROTO_HEADER = resolve/proto.h
@@ -114,12 +114,12 @@ OBJ_FILES = clireadwrite.o \
clideltree.o
PUBLIC_DEPENDENCIES = LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH \
LIBCLI_SMB_COMPOSITE LIBCLI_NBT LIBSECURITY LIBCLI_RESOLVE \
- LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS SOCKET
+ LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS LIBSAMBA-SOCKET
[SUBSYSTEM::LIBCLI_RAW]
PRIVATE_PROTO_HEADER = raw/raw_proto.h
PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE
-PUBLIC_DEPENDENCIES = SOCKET LIBPACKET gensec LIBCRYPTO
+PUBLIC_DEPENDENCIES = LIBSAMBA-SOCKET LIBPACKET gensec LIBCRYPTO
LDFLAGS = $(SUBSYSTEM_LIBCLI_SMB_COMPOSITE_OUTPUT)
OBJ_FILES = raw/rawfile.o \
raw/smb_signing.o \
diff --git a/source4/libcli/ldap/config.mk b/source4/libcli/ldap/config.mk
index 167a07eddd..c1c74cd168 100644
--- a/source4/libcli/ldap/config.mk
+++ b/source4/libcli/ldap/config.mk
@@ -11,7 +11,7 @@ OBJ_FILES = ldap.o \
ldap_ildap.o \
ldap_controls.o
PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBEVENTS LIBPACKET
-PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE SOCKET LIBCLI_RESOLVE NDR_SAMR LIBTLS ASN1_UTIL
+PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE LIBSAMBA-SOCKET LIBCLI_RESOLVE NDR_SAMR LIBTLS ASN1_UTIL
#PRIVATE_DEPENDENCIES = gensec
# End SUBSYSTEM LIBCLI_LDAP
#################################
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 56d8a5b27c..fbc76b32a0 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -593,7 +593,7 @@ OBJ_FILES = \
rpc/dcerpc_sock.o \
rpc/dcerpc_connect.o
PUBLIC_DEPENDENCIES = \
- SOCKET LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 \
+ LIBSAMBA-SOCKET LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 \
LIBNDR NDR_DCERPC \
RPC_NDR_EPMAPPER \
NDR_SCHANNEL RPC_NDR_NETLOGON \
diff --git a/source4/utils/config.mk b/source4/utils/config.mk
index e2c853d72a..f5b42b30ea 100644
--- a/source4/utils/config.mk
+++ b/source4/utils/config.mk
@@ -98,7 +98,7 @@ PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG \
LIBSAMBA-UTIL \
LIBPOPT \
- SOCKET \
+ LIBSAMBA-SOCKET \
POPT_SAMBA \
LIBCLI_RESOLVE \
CHARSET