diff options
| -rw-r--r-- | source3/Makefile.in | 9 | ||||
| -rw-r--r-- | source3/build/dynconfig.py | 1 | ||||
| -rw-r--r-- | source3/build/wscript | 3 | ||||
| -rw-r--r-- | source3/dynconfig.c | 1 | ||||
| -rw-r--r-- | source3/include/dynconfig.h | 4 | ||||
| -rw-r--r-- | source3/include/localedir.h | 6 | ||||
| -rw-r--r-- | source3/localedir.c | 3 | ||||
| -rw-r--r-- | source3/utils/net.c | 2 | ||||
| -rw-r--r-- | source3/utils/net.h | 1 | ||||
| -rwxr-xr-x | source3/wscript_build | 7 |
10 files changed, 9 insertions, 28 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 561f215656b..ff05d02f0bc 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -1205,7 +1205,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) \ @@ -1740,13 +1740,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 f243baa92d6..65436b982dd 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 70219bc10a6..d370daf8996 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 c3ecae503c8..32f64a6e22c 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 cd6dcb78d1a..d0e42dc9f51 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 2a291d3ceb3..00000000000 --- 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 20f69219ed8..00000000000 --- 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 7ade3070e75..c53b2859b09 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 7ac3b5c6bdb..ac43068c12f 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 ee0ed7cda50..3f9437ae171 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -1085,7 +1085,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 @@ -1332,11 +1332,6 @@ if not bld.env.toplevel_build: 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='', |