summaryrefslogtreecommitdiff
path: root/source4/libcli
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 /source4/libcli
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)
Diffstat (limited to 'source4/libcli')
-rw-r--r--source4/libcli/config.mk8
-rw-r--r--source4/libcli/ldap/config.mk2
2 files changed, 5 insertions, 5 deletions
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
#################################