Author: jelmer Date: 2006-05-01 12:54:36 +0000 (Mon, 01 May 2006) New Revision: 15373
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15373 Log: Rename SOCKET to LIBSAMBA-SOCKET to prevent name clashes with -lsocket on SUN boxes. Modified: branches/SAMBA_4_0/source/auth/kerberos/config.mk branches/SAMBA_4_0/source/heimdal_build/config.mk branches/SAMBA_4_0/source/lib/socket/config.mk branches/SAMBA_4_0/source/libcli/config.mk branches/SAMBA_4_0/source/libcli/ldap/config.mk branches/SAMBA_4_0/source/librpc/config.mk branches/SAMBA_4_0/source/utils/config.mk Changeset: Modified: branches/SAMBA_4_0/source/auth/kerberos/config.mk =================================================================== --- branches/SAMBA_4_0/source/auth/kerberos/config.mk 2006-05-01 06:49:02 UTC (rev 15372) +++ branches/SAMBA_4_0/source/auth/kerberos/config.mk 2006-05-01 12:54:36 UTC (rev 15373) @@ -9,7 +9,7 @@ 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 ################################# Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk =================================================================== --- branches/SAMBA_4_0/source/heimdal_build/config.mk 2006-05-01 06:49:02 UTC (rev 15372) +++ branches/SAMBA_4_0/source/heimdal_build/config.mk 2006-05-01 12:54:36 UTC (rev 15373) @@ -320,7 +320,7 @@ ../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 Modified: branches/SAMBA_4_0/source/lib/socket/config.mk =================================================================== --- branches/SAMBA_4_0/source/lib/socket/config.mk 2006-05-01 06:49:02 UTC (rev 15372) +++ branches/SAMBA_4_0/source/lib/socket/config.mk 2006-05-01 12:54:36 UTC (rev 15373) @@ -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 @@ ################################################ # Start MODULE socket_ipv6 [MODULE::socket_ipv6] -SUBSYSTEM = SOCKET +SUBSYSTEM = LIBSAMBA-SOCKET OUTPUT_TYPE = INTEGRATED OBJ_FILES = \ socket_ipv6.o @@ -25,7 +25,7 @@ ################################################ # Start MODULE socket_unix [MODULE::socket_unix] -SUBSYSTEM = SOCKET +SUBSYSTEM = LIBSAMBA-SOCKET OUTPUT_TYPE = INTEGRATED OBJ_FILES = \ socket_unix.o @@ -35,7 +35,7 @@ ################################################ # Start SUBSYSTEM SOCKET -[SUBSYSTEM::SOCKET] +[SUBSYSTEM::LIBSAMBA-SOCKET] OBJ_FILES = \ socket.o \ access.o \ Modified: branches/SAMBA_4_0/source/libcli/config.mk =================================================================== --- branches/SAMBA_4_0/source/libcli/config.mk 2006-05-01 06:49:02 UTC (rev 15372) +++ branches/SAMBA_4_0/source/libcli/config.mk 2006-05-01 12:54:36 UTC (rev 15373) @@ -54,7 +54,7 @@ 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 @@ 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 @@ 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 \ Modified: branches/SAMBA_4_0/source/libcli/ldap/config.mk =================================================================== --- branches/SAMBA_4_0/source/libcli/ldap/config.mk 2006-05-01 06:49:02 UTC (rev 15372) +++ branches/SAMBA_4_0/source/libcli/ldap/config.mk 2006-05-01 12:54:36 UTC (rev 15373) @@ -11,7 +11,7 @@ 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 ################################# Modified: branches/SAMBA_4_0/source/librpc/config.mk =================================================================== --- branches/SAMBA_4_0/source/librpc/config.mk 2006-05-01 06:49:02 UTC (rev 15372) +++ branches/SAMBA_4_0/source/librpc/config.mk 2006-05-01 12:54:36 UTC (rev 15373) @@ -593,7 +593,7 @@ 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 \ Modified: branches/SAMBA_4_0/source/utils/config.mk =================================================================== --- branches/SAMBA_4_0/source/utils/config.mk 2006-05-01 06:49:02 UTC (rev 15372) +++ branches/SAMBA_4_0/source/utils/config.mk 2006-05-01 12:54:36 UTC (rev 15373) @@ -98,7 +98,7 @@ LIBSAMBA-CONFIG \ LIBSAMBA-UTIL \ LIBPOPT \ - SOCKET \ + LIBSAMBA-SOCKET \ POPT_SAMBA \ LIBCLI_RESOLVE \ CHARSET