[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Wed Apr 13 00:40:03 MDT 2011
The branch, master has been updated
via 53e0bad build: Bring DYNCONFIG into samba-util library to avoid symbol duplication
via d309499 s3-build Remove distinct LOCALEDIR subsystem
from 887fdb7 s4-test: added a test for E_deshash()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 53e0bada43a9185f502a38e960337b51aab7bcf8
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Apr 13 15:26:30 2011 +1000
build: Bring DYNCONFIG into samba-util library to avoid symbol duplication
When this was depended on directly as a subsystem, it ended up in
multiple libraries.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet at samba.org>
Autobuild-Date: Wed Apr 13 08:39:35 CEST 2011 on sn-devel-104
commit d309499b9e268bff5e366a9986528f0accbc02b3
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Apr 13 15:13:45 2011 +1000
s3-build Remove distinct LOCALEDIR subsystem
This is no different to the rest of dynconfig, and so should be dealt
with there.
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
lib/util/wscript_build | 2 +-
source3/Makefile.in | 9 +--------
source3/build/dynconfig.py | 1 +
source3/build/wscript | 3 ---
source3/dynconfig.c | 1 +
source3/include/dynconfig.h | 4 ++++
source3/include/localedir.h | 6 ------
source3/localedir.c | 3 ---
source3/utils/net.c | 2 +-
source3/utils/net.h | 1 -
source3/wscript_build | 17 ++++++-----------
11 files changed, 15 insertions(+), 34 deletions(-)
delete mode 100644 source3/include/localedir.h
delete mode 100644 source3/localedir.c
Changeset truncated at 500 lines:
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 8e73e0f..1186cd7 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -24,7 +24,7 @@ if bld.env._SAMBA_BUILD_ == 4:
source='''dprintf.c
ms_fnmatch.c parmlist.c substitute.c util_str.c
''',
- deps='samba-util-common',
+ deps='samba-util-common DYNCONFIG',
public_deps='talloc CHARSET execinfo uid_wrapper',
public_headers='attr.h byteorder.h data_blob.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/Makefile.in b/source3/Makefile.in
index c20323c..a32ac26 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1200,7 +1200,7 @@ NET_OBJ = $(NET_OBJ1) \
$(LIBSMBCONF_OBJ) \
$(REGFIO_OBJ) \
$(PRIVILEGES_BASIC_OBJ) \
- $(LIB_EVENTLOG_OBJ) localedir.o
+ $(LIB_EVENTLOG_OBJ)
CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
$(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
@@ -1730,13 +1730,6 @@ libsmb/libsmb_thread_posix.o: libsmb/libsmb_thread_posix.c
$(COMPILE_CC) $(PTHREAD_CFLAGS) >/dev/null 2>&1
### End section of object files that require PTHREAD_CFLAGS
-localedir.o: localedir.c Makefile
- @echo Compiling $*.c
- @$(COMPILE_CC_PATH) && exit 0;\
- echo "The following command failed:" 1>&2;\
- echo "$(COMPILE_CC_PATH)" 1>&2;\
- $(COMPILE_CC_PATH) >/dev/null 2>&1
-
lib/pidfile.o: lib/pidfile.c
@echo Compiling $*.c
@$(COMPILE_CC_PATH) && exit 0;\
diff --git a/source3/build/dynconfig.py b/source3/build/dynconfig.py
index f243baa..65436b9 100644
--- a/source3/build/dynconfig.py
+++ b/source3/build/dynconfig.py
@@ -30,6 +30,7 @@ dyn_cflags = {
'CONFIGFILE' : '${SYSCONFDIR}/smb.conf',
'DATADIR' : '${DATADIR}',
'LIBDIR' : '${LIBDIR}',
+ 'LOCALEDIR' : '${LOCALEDIR}',
'LMHOSTSFILE' : '${SYSCONFDIR}/lmhosts',
'LOCKDIR' : '${LOCALSTATEDIR}/locks',
'LOGFILEBASE' : '${LOCALSTATEDIR}',
diff --git a/source3/build/wscript b/source3/build/wscript
index 70219bc..d370daf 100644
--- a/source3/build/wscript
+++ b/source3/build/wscript
@@ -45,9 +45,6 @@ def build(bld):
'../dynconfig.c',
deps='replace talloc tdb popt',
cflags=cflags)
- bld.SAMBA3_SUBSYSTEM('LOCALE_DIR',
- '../localedir.c',
- cflags='-DLOCALEDIR=\"%s\"' % bld.env.LOCALEDIR)
def dynconfig_cflags(bld):
diff --git a/source3/dynconfig.c b/source3/dynconfig.c
index c3ecae5..32f64a6 100644
--- a/source3/dynconfig.c
+++ b/source3/dynconfig.c
@@ -83,3 +83,4 @@ DEFINE_DYN_CONFIG_PARAM(NMBDSOCKETDIR)
DEFINE_DYN_CONFIG_PARAM(NCALRPCDIR)
DEFINE_DYN_CONFIG_PARAM(SMB_PASSWD_FILE)
DEFINE_DYN_CONFIG_PARAM(PRIVATE_DIR)
+DEFINE_DYN_CONFIG_PARAM(LOCALEDIR)
diff --git a/source3/include/dynconfig.h b/source3/include/dynconfig.h
index cd6dcb7..d0e42dc 100644
--- a/source3/include/dynconfig.h
+++ b/source3/include/dynconfig.h
@@ -94,3 +94,7 @@ bool is_default_dyn_SMB_PASSWD_FILE(void);
const char *get_dyn_PRIVATE_DIR(void);
const char *set_dyn_PRIVATE_DIR(const char *newpath);
bool is_default_dyn_PRIVATE_DIR(void);
+
+const char *get_dyn_LOCALEDIR(void);
+const char *set_dyn_LOCALEDIR(const char *newpath);
+bool is_default_dyn_LOCALEDIR(void);
diff --git a/source3/include/localedir.h b/source3/include/localedir.h
deleted file mode 100644
index 2a291d3..0000000
--- a/source3/include/localedir.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __LOCALEDIR_H__
-#define __LOCALEDIR_H__
-
-extern const char *dyn_LOCALEDIR;
-
-#endif
diff --git a/source3/localedir.c b/source3/localedir.c
deleted file mode 100644
index 20f6921..0000000
--- a/source3/localedir.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "localedir.h"
-
-const char *dyn_LOCALEDIR = LOCALEDIR;
diff --git a/source3/utils/net.c b/source3/utils/net.c
index 7ade307..c53b285 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -832,7 +832,7 @@ static struct functable net_func[] = {
setlocale(LC_ALL, "");
#if defined(HAVE_BINDTEXTDOMAIN)
- bindtextdomain(MODULE_NAME, dyn_LOCALEDIR);
+ bindtextdomain(MODULE_NAME, get_dyn_LOCALEDIR());
#endif
#if defined(HAVE_TEXTDOMAIN)
textdomain(MODULE_NAME);
diff --git a/source3/utils/net.h b/source3/utils/net.h
index 7ac3b5c..ac43068 100644
--- a/source3/utils/net.h
+++ b/source3/utils/net.h
@@ -22,7 +22,6 @@
* include
*/
-#include "localedir.h"
#include "../librpc/gen_ndr/lsa.h"
#include "intl.h"
diff --git a/source3/wscript_build b/source3/wscript_build
index 6eb0c4c..15c4b2a 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -662,7 +662,7 @@ if not bld.env.toplevel_build:
bld.SAMBA3_LIBRARY('netapi',
source=LIBNETAPI_SRC,
public_deps='''talloc tdb cap wbclient LIB_NONSMBD LIBSMB KRBCLIENT
- passdb SMBLDAP PARAM_WITHOUT_REG DYNCONFIG
+ passdb SMBLDAP PARAM_WITHOUT_REG samba-util
LIBMSRPC_GEN msrpc3 ads LIBNET DCUTIL NDR_LIBNETAPI
RPC_CLIENT_SCHANNEL LIB_SMBCONF REG_SMBCONF TOKEN_UTIL
LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON
@@ -739,7 +739,7 @@ bld.SAMBA3_SUBSYSTEM('PARAM_WITHOUT_REG',
bld.SAMBA3_LIBRARY('param',
source='',
- deps='PARAM_WITHOUT_REG DYNCONFIG LIB_SMBCONF',
+ deps='PARAM_WITHOUT_REG samba-util LIB_SMBCONF',
private_library=True,
vars=locals())
@@ -854,7 +854,7 @@ bld.SAMBA3_SUBSYSTEM('LIB_SMBCONF',
bld.SAMBA3_LIBRARY('smbd_base',
source=SMBD_SRC_BASE,
deps='''tdb tevent dl krb5 ldap gssapi gssapi_krb5
- DYNCONFIG wbclient crypt nsl cups cap resolv z passdb
+ samba-util wbclient crypt nsl cups cap resolv z passdb
PARAM_WITHOUT_REG samba3core LIBSMB POPT_SAMBA3 KRBCLIENT AVAHI
LIBMSRPC_GEN msrpc3 ads LIBADS_SERVER LIBADS_PRINTER
vfs vfs_default vfs_posixacl auth rpc LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE
@@ -965,7 +965,7 @@ bld.SAMBA3_SUBSYSTEM('tdb-wrap3',
bld.SAMBA3_SUBSYSTEM('CHARSET3',
source='''lib/util_str.c lib/charcnv.c ../lib/util/charset/convert_string.c lib/fstring.c''',
public_deps='ICONV_WRAPPER CODEPOINTS',
- deps='DYNCONFIG')
+ deps='samba-util')
bld.SAMBA3_SUBSYSTEM('ldb3',
source='lib/ldb_compat.c')
@@ -1073,7 +1073,7 @@ bld.SAMBA3_BINARY('net',
source=NET_SRC,
deps='''talloc tdb netapi addns cap resolv intl POPT_SAMBA3 passdb LIBSMB LIB_NONSMBD
PARAM_WITHOUT_REG wbclient param KRBCLIENT LIBMSRPC_GEN msrpc3 LIBGPO ads LIBADS_SERVER LIBADS_PRINTER
- LOCALE_DIR LIBAFS LIBAFS_SETTOKEN SMBREADLINE PASSWD_UTIL LIBNET
+ LIBAFS LIBAFS_SETTOKEN SMBREADLINE PASSWD_UTIL LIBNET
LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG DCUTIL
REGFIO NDR_NTPRINTING RPC_NDR_WINREG
RPC_CLIENT_SCHANNEL TOKEN_UTIL
@@ -1314,18 +1314,13 @@ if not bld.env.toplevel_build:
bld.SAMBA3_SUBSYSTEM('POPT_SAMBA', source='', deps='POPT_SAMBA3')
bld.SAMBA3_SUBSYSTEM('tdb-wrap', source='', deps='tdb-wrap3')
bld.SAMBA3_SUBSYSTEM('errors', source='', deps='errors3')
- bld.SAMBA3_SUBSYSTEM('samba-util', source='')
+ bld.SAMBA3_SUBSYSTEM('samba-util', source='', deps='DYNCONFIG')
bld.SAMBA3_SUBSYSTEM('CHARSET', source='', deps='CHARSET3')
bld.SAMBA3_SUBSYSTEM('ldb', source='', deps='ldb3')
bld.SAMBA3_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT')
bld.SAMBA3_SUBSYSTEM('cli-ldap', '', deps='UTIL_TEVENT')
else:
- # dynconfig provides this in the toplevel build
- bld.SAMBA3_SUBSYSTEM('LOCALE_DIR',
- 'localedir.c',
- cflags='-DLOCALEDIR=\"%s\"' % bld.env.LOCALEDIR)
-
# point the s3 rules at in-tree heimdal
bld.SAMBA3_SUBSYSTEM('gssapi_krb5',
source='',
--
Samba Shared Repository
More information about the samba-cvs
mailing list