$(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) \
$(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;\
'CONFIGFILE' : '${SYSCONFDIR}/smb.conf',
'DATADIR' : '${DATADIR}',
'LIBDIR' : '${LIBDIR}',
+ 'LOCALEDIR' : '${LOCALEDIR}',
'LMHOSTSFILE' : '${SYSCONFDIR}/lmhosts',
'LOCKDIR' : '${LOCALSTATEDIR}/locks',
'LOGFILEBASE' : '${LOCALSTATEDIR}',
'../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):
DEFINE_DYN_CONFIG_PARAM(NCALRPCDIR)
DEFINE_DYN_CONFIG_PARAM(SMB_PASSWD_FILE)
DEFINE_DYN_CONFIG_PARAM(PRIVATE_DIR)
+DEFINE_DYN_CONFIG_PARAM(LOCALEDIR)
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);
+++ /dev/null
-#ifndef __LOCALEDIR_H__
-#define __LOCALEDIR_H__
-
-extern const char *dyn_LOCALEDIR;
-
-#endif
+++ /dev/null
-#include "localedir.h"
-
-const char *dyn_LOCALEDIR = LOCALEDIR;
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);
* include
*/
-#include "localedir.h"
#include "../librpc/gen_ndr/lsa.h"
#include "intl.h"
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
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='',