[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Mon Apr 12 01:19:40 MDT 2010
The branch, master has been updated
via 33bb334... s4-waf: inline LIBREPLACE_NETWORK into 'replace'
via b139308... lib/replace/wscript: rename REPLACE_H_SOURCE => REPLACE_HOSTCC_SOURCE
via 0d307f2... lib/replace/wscript: implement the same getpass detection logic as the autoconf version
via e37b834... lib/replace/wscript: inline LIBREPLACE_GETPASS into 'replace'
from a9e4aba... s4/libnet: Allocate mem in supplied mem_ctx
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 33bb334e8030749cb675353df882730e3119ee9c
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Apr 11 19:24:46 2010 +0200
s4-waf: inline LIBREPLACE_NETWORK into 'replace'
metze
commit b1393087ace8289a13e09e5246ac0efec560e959
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Apr 12 09:12:29 2010 +0200
lib/replace/wscript: rename REPLACE_H_SOURCE => REPLACE_HOSTCC_SOURCE
metze
commit 0d307f25a051544047563a40de4df344c17f0d9f
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Apr 12 08:29:53 2010 +0200
lib/replace/wscript: implement the same getpass detection logic as the autoconf version
metze
commit e37b834a62a45c890cf05f208ffc077a1cf10d16
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Apr 11 19:16:32 2010 +0200
lib/replace/wscript: inline LIBREPLACE_GETPASS into 'replace'
metze
-----------------------------------------------------------------------
Summary of changes:
lib/async_req/wscript_build | 2 +-
lib/replace/wscript | 44 ++++++++++++++--------------------
lib/tsocket/wscript_build | 1 -
lib/util/wscript_build | 2 +-
source4/heimdal_build/wscript_build | 2 +-
source4/lib/socket/wscript_build | 6 ++--
6 files changed, 24 insertions(+), 33 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/async_req/wscript_build b/lib/async_req/wscript_build
index 790b547..f3ac7f0 100644
--- a/lib/async_req/wscript_build
+++ b/lib/async_req/wscript_build
@@ -3,6 +3,6 @@
bld.SAMBA_SUBSYSTEM('LIBASYNC_REQ',
source='async_sock.c',
- public_deps='LIBREPLACE_NETWORK talloc tevent'
+ public_deps='talloc tevent'
)
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 9af1e57..bfe9142 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -281,8 +281,8 @@ def configure(conf):
# if we have both, then we prefer getpassphrase
conf.DEFINE('REPLACE_GETPASS_BY_GETPASSPHRASE', 1)
conf.DEFINE('REPLACE_GETPASS', 1)
-
- conf.CHECK_CODE('''#include "getpass.c"
+ else:
+ conf.CHECK_CODE('''#include "getpass.c"
int main(void) { return 0; }''',
addmain=False,
define='REPLACE_GETPASS',
@@ -295,28 +295,37 @@ def configure(conf):
def build(bld):
bld.RECURSE('buildtools/wafsamba')
- REPLACE_H_SOURCE = 'replace.c snprintf.c'
+ REPLACE_HOSTCC_SOURCE = 'replace.c snprintf.c'
- if bld.CONFIG_SET('REPLACE_STRPTIME'): REPLACE_H_SOURCE += ' strptime.c'
- if not bld.CONFIG_SET('HAVE_TIMEGM'): REPLACE_H_SOURCE += ' timegm.c'
+ if bld.CONFIG_SET('REPLACE_STRPTIME'): REPLACE_HOSTCC_SOURCE += ' strptime.c'
+ if not bld.CONFIG_SET('HAVE_TIMEGM'): REPLACE_HOSTCC_SOURCE += ' timegm.c'
bld.SAMBA_SUBSYSTEM('LIBREPLACE_H',
- REPLACE_H_SOURCE,
+ REPLACE_HOSTCC_SOURCE,
+
cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
group='compiler_libraries'
)
- REPLACE_SOURCE = REPLACE_H_SOURCE
+ REPLACE_SOURCE = REPLACE_HOSTCC_SOURCE
+
+ if bld.CONFIG_SET('REPLACE_GETPASS'): REPLACE_SOURCE += ' getpass.c'
- if not bld.CONFIG_SET('HAVE_GETIFADDRS'): REPLACE_SOURCE += ' getifaddrs.c'
if not bld.CONFIG_SET('HAVE_DLOPEN'): REPLACE_SOURCE += ' dlfcn.c'
+
if not bld.CONFIG_SET('HAVE_SOCKETPAIR'): REPLACE_SOURCE += ' socketpair.c'
if not bld.CONFIG_SET('HAVE_CONNECT'): REPLACE_SOURCE += ' socket.c'
+ if not bld.CONFIG_SET('HAVE_GETIFADDRS'): REPLACE_SOURCE += ' getifaddrs.c'
+ if not bld.CONFIG_SET('HAVE_GETADDRINFO'): REPLACE_SOURCE += ' getaddrinfo.c'
+ if not bld.CONFIG_SET('HAVE_INET_NTOA'): REPLACE_SOURCE += ' inet_ntoa.c'
+ if not bld.CONFIG_SET('HAVE_INET_ATON'): REPLACE_SOURCE += ' inet_aton.c'
+ if not bld.CONFIG_SET('HAVE_INET_NTOP'): REPLACE_SOURCE += ' inet_ntop.c'
+ if not bld.CONFIG_SET('HAVE_INET_PTON'): REPLACE_SOURCE += ' inet_pton.c'
bld.SAMBA_LIBRARY('replace',
source=REPLACE_SOURCE,
group='base_libraries',
- deps='LIBREPLACE_GETPASS nsl socket')
+ deps='nsl socket')
TEST_SOURCES = '''test/testsuite.c test/main.c test/strptime.c
test/os2_delete.c test/getifaddrs.c'''
@@ -327,19 +336,6 @@ def build(bld):
deps='replace',
install=False)
- NET_SOURCES = []
- if not bld.CONFIG_SET('HAVE_INET_NTOA'): NET_SOURCES.append('inet_ntoa.c')
- if not bld.CONFIG_SET('HAVE_INET_ATON'): NET_SOURCES.append('inet_aton.c')
- if not bld.CONFIG_SET('HAVE_INET_NTOP'): NET_SOURCES.append('inet_ntop.c')
- if not bld.CONFIG_SET('HAVE_INET_PTON'): NET_SOURCES.append('inet_pton.c')
- if not bld.CONFIG_SET('HAVE_SOCKETPAIR'): NET_SOURCES.append('socketpair.c')
- if not bld.CONFIG_SET('HAVE_GETADDRINFO'):NET_SOURCES.append('getaddrinfo.c')
-
- bld.SAMBA_SUBSYSTEM('LIBREPLACE_NETWORK', NET_SOURCES,
- group='base_libraries',
- deps='replace')
-
-
CRYPT_SOURCES = []
if not 'HAVE_CRYPT' in bld.env: CRYPT_SOURCES.append('crypt.c')
@@ -347,10 +343,6 @@ def build(bld):
CRYPT_SOURCES,
group='base_libraries')
- bld.SAMBA_SUBSYSTEM('LIBREPLACE_GETPASS', 'getpass.c',
- group='base_libraries',
- enabled=bld.CONFIG_SET('REPLACE_GETPASS'))
-
# build replacements for stdint.h and stdbool.h if needed
bld.SAMBA_GENERATOR('replace_stdint_h',
rule='cp ${SRC} ${TGT}',
diff --git a/lib/tsocket/wscript_build b/lib/tsocket/wscript_build
index 34d382e..5fa05f8 100644
--- a/lib/tsocket/wscript_build
+++ b/lib/tsocket/wscript_build
@@ -5,6 +5,5 @@ bld.SAMBA_SUBSYSTEM('LIBTSOCKET',
source='tsocket.c tsocket_helpers.c tsocket_bsd.c',
public_deps='talloc tevent',
public_headers='tsocket.h tsocket_internal.h',
- deps='LIBREPLACE_NETWORK'
)
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 6e6dc8e..debc701 100644
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -2,7 +2,7 @@
bld.SAMBA_LIBRARY('LIBSAMBA-UTIL',
source='xfile.c debug.c fault.c signal.c system.c time.c genrand.c dprintf.c util_str.c rfc1738.c substitute.c util_strlist.c util_file.c data_blob.c util.c blocking.c util_net.c fsusage.c ms_fnmatch.c mutex.c idtree.c become_daemon.c rbtree.c talloc_stack.c smb_threads.c params.c parmlist.c util_id.c',
- public_deps='talloc LIBCRYPTO LIBREPLACE_NETWORK CHARSET execinfo UID_WRAPPER tevent',
+ public_deps='talloc LIBCRYPTO CHARSET execinfo UID_WRAPPER tevent',
public_headers='attr.h byteorder.h data_blob.h debug.h memory.h mutex.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h',
header_path= [ ('dlinklist.h util.h', '.'), ('*', 'util') ],
local_include=False,
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index 7f605db..d40be0b 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -217,7 +217,7 @@ HEIMDAL_ROKEN_SOURCE = HEIMDAL_ROKEN_H_SOURCE + '''
bld.SAMBA_SUBSYSTEM('HEIMDAL_ROKEN',
HEIMDAL_ROKEN_SOURCE,
includes='../heimdal/lib/roken ../heimdal/include ../../lib/socket_wrapper',
- deps='resolv LIBREPLACE_NETWORK UID_WRAPPER util'
+ deps='resolv UID_WRAPPER util'
)
diff --git a/source4/lib/socket/wscript_build b/source4/lib/socket/wscript_build
index 7ce9e65..c2de5f4 100644
--- a/source4/lib/socket/wscript_build
+++ b/source4/lib/socket/wscript_build
@@ -4,14 +4,14 @@
bld.SAMBA_SUBSYSTEM('LIBNETIF',
source='interface.c netif.c',
autoproto='netif_proto.h',
- deps='LIBSAMBA-UTIL LIBREPLACE_NETWORK'
+ deps='LIBSAMBA-UTIL'
)
bld.SAMBA_MODULE('socket_ip',
source='socket_ip.c',
subsystem='samba_socket',
- deps='LIBSAMBA-ERRORS LIBREPLACE_NETWORK',
+ deps='LIBSAMBA-ERRORS',
internal_module=True
)
@@ -19,7 +19,7 @@ bld.SAMBA_MODULE('socket_ip',
bld.SAMBA_MODULE('socket_unix',
source='socket_unix.c',
subsystem='samba_socket',
- deps='LIBREPLACE_NETWORK talloc',
+ deps='talloc',
internal_module=True
)
--
Samba Shared Repository
More information about the samba-cvs
mailing list