The branch, v3-6-test has been updated
via 93bfcc0 s3-waf: try to deal with underlinked cups libraries.
via 055e35d s3-waf: move all error mappings to errors subsystem.
via 31e8e12 waf: pure cosmetic reformatting of the two samba-util
object lists (to ease comparing).
from 91751c9 s4-build: fixed export of krb5pac.h, needed by other public
headers
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 93bfcc06155a44a76f150b23bb5267f439f454d3
Author: Günther Deschner <[email protected]>
Date: Fri Feb 11 14:37:13 2011 +0100
s3-waf: try to deal with underlinked cups libraries.
Guenther
Autobuild-User: Günther Deschner <[email protected]>
Autobuild-Date: Fri Feb 11 15:28:32 CET 2011 on sn-devel-104
(cherry picked from commit 414f39872dd2fa8541cfd93e3d3b22cc941c5477)
commit 055e35dbc5f8e1ef282020ac62de306d98afb9d9
Author: Günther Deschner <[email protected]>
Date: Tue Feb 8 22:37:09 2011 +0100
s3-waf: move all error mappings to errors subsystem.
Guenther
(cherry picked from commit 59c8839dec275fd252e4570cbc9561f66a689a56)
commit 31e8e12fc487dc0805c2ce1a88918e389368f6ea
Author: Günther Deschner <[email protected]>
Date: Tue Feb 8 01:04:57 2011 +0100
waf: pure cosmetic reformatting of the two samba-util object lists (to ease
comparing).
Guenther
(cherry picked from commit 3eb7e125ab2488221a70fdf5fb7ddcb9194a5b6a)
-----------------------------------------------------------------------
Summary of changes:
lib/util/wscript_build | 31 ++++++++++++++++++++++++++++++-
source3/wscript | 2 +-
source3/wscript_build | 45 ++++++++++++++++++++++++++++-----------------
3 files changed, 59 insertions(+), 19 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 375a148..6930b65 100644
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -1,7 +1,36 @@
#!/usr/bin/env python
bld.SAMBA_LIBRARY('samba-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 idtree.c
become_daemon.c rbtree.c talloc_stack.c smb_threads.c params.c parmlist.c
util_id.c select.c',
+ source='''
+ become_daemon.c
+ blocking.c
+ data_blob.c
+ debug.c
+ dprintf.c
+ fault.c
+ fsusage.c
+ genrand.c
+ idtree.c
+ ms_fnmatch.c
+ params.c
+ parmlist.c
+ rbtree.c
+ rfc1738.c
+ select.c
+ signal.c
+ smb_threads.c
+ substitute.c
+ system.c
+ talloc_stack.c
+ time.c
+ util.c
+ util_file.c
+ util_id.c
+ util_net.c
+ util_str.c
+ util_strlist.c
+ xfile.c
+ ''',
public_deps='talloc LIBCRYPTO CHARSET execinfo uid_wrapper',
public_headers='attr.h byteorder.h data_blob.h debug.h memory.h
safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h',
header_path= [ ('dlinklist.h util.h', '.'), ('*', 'util') ],
diff --git a/source3/wscript b/source3/wscript
index 3957fca..9b1cb53 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -520,7 +520,7 @@ msg.msg_acctrightslen = sizeof(fd);
conf.check_cfg(path=conf.env.CUPS_CONFIG, args="--cflags --ldflags
--libs",
package="", uselib_store="cups")
conf.CHECK_HEADERS('cups/cups.h cups/language.h', lib='cups')
- conf.CHECK_FUNCS_IN('httpConnect httpConnectEncrypt', 'cups')
+ conf.CHECK_FUNCS_IN('httpConnect httpConnectEncrypt',
conf.env.LIB_cups)
if conf.CONFIG_SET('HAVE_CUPS_CUPS_H') and
conf.CONFIG_SET('HAVE_CUPS_LANGUAGE_H'):
conf.DEFINE('HAVE_CUPS', '1')
else:
diff --git a/source3/wscript_build b/source3/wscript_build
index 8d10b7a..8bc2028 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -53,18 +53,31 @@ LIBREPLACE_SRC = '''${LIBREPLACE_SRCS}'''
LIBSAMBAUTIL_SRC = '''${LIBREPLACE_SRC}'''
-UTIL_SRC = '''../lib/util/rbtree.c ../lib/util/signal.c ../lib/util/time.c
- ../lib/util/xfile.c ../lib/util/util_strlist.c
- ../lib/util/util_file.c ../lib/util/data_blob.c
- ../lib/util/util.c ../lib/util/fsusage.c
- ../lib/util/params.c ../lib/util/talloc_stack.c
- ../lib/util/genrand.c ../lib/util/util_net.c
- ../lib/util/become_daemon.c ../lib/util/system.c
- ../lib/util/tevent_unix.c ../lib/util/tevent_ntstatus.c
- ../lib/util/tevent_werror.c
- ../lib/util/smb_threads.c ../lib/util/util_id.c
- ../lib/util/blocking.c ../lib/util/rfc1738.c
- ../lib/util/select.c'''
+UTIL_SRC = '''
+ ../lib/util/become_daemon.c
+ ../lib/util/blocking.c
+ ../lib/util/data_blob.c
+ ../lib/util/fsusage.c
+ ../lib/util/genrand.c
+ ../lib/util/params.c
+ ../lib/util/rbtree.c
+ ../lib/util/rfc1738.c
+ ../lib/util/select.c
+ ../lib/util/signal.c
+ ../lib/util/smb_threads.c
+ ../lib/util/system.c
+ ../lib/util/talloc_stack.c
+ ../lib/util/tevent_ntstatus.c
+ ../lib/util/tevent_unix.c
+ ../lib/util/tevent_werror.c
+ ../lib/util/time.c
+ ../lib/util/util.c
+ ../lib/util/util_file.c
+ ../lib/util/util_id.c
+ ../lib/util/util_net.c
+ ../lib/util/util_strlist.c
+ ../lib/util/xfile.c
+ '''
LIBTEVENT_SRC0 = ''
@@ -95,7 +108,7 @@ LIB_SRC = '''${LIBSAMBAUTIL_SRC}
lib/util.c lib/util_names.c
lib/util_sock.c lib/sock_exec.c lib/util_sec.c
lib/substitute.c lib/dbwrap_util.c
- lib/ms_fnmatch.c lib/errmap_unix.c
+ lib/ms_fnmatch.c
lib/tallocmsg.c lib/dmallocmsg.c
libsmb/clisigning.c libsmb/smb_signing.c
intl/lang_tdb.c
@@ -146,11 +159,9 @@ LIBNMB_SRC = '''libsmb/unexpected.c libsmb/namecache.c
libsmb/nmblib.c
libsmb/namequery.c ../libcli/nbt/lmhosts.c libsmb/conncache.c
libads/dns.c libads/sitename_cache.c'''
-NTERR_SRC = '''libsmb/smberr.c'''
-ERRORMAP_SRC = 'libsmb/errormap.c'
DCE_RPC_ERR_SRC = '../librpc/rpc/dcerpc_error.c'
-LIBSMB_ERR_SRC = '''${NTERR_SRC} ${ERRORMAP_SRC} ${DCE_RPC_ERR_SRC}'''
+LIBSMB_ERR_SRC = '''${DCE_RPC_ERR_SRC}'''
LIBSMB_SRC0 = '''
libsmb/ntlmssp.c
@@ -1060,7 +1071,7 @@ bld.SAMBA_SUBSYSTEM('NDR_DCERPC',
vars=locals())
bld.SAMBA_SUBSYSTEM('errors',
- source='../libcli/util/doserr.c libsmb/nterr.c')
+ source='../libcli/util/doserr.c libsmb/nterr.c libsmb/errormap.c
libsmb/smberr.c lib/errmap_unix.c')
bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF',
source='../libcli/nbt/nbtname.c',
--
Samba Shared Repository
