From: Andrew Tridgell Date: Wed, 9 Feb 2011 04:56:56 +0000 (+1100) Subject: s4-build: added LOCALEDIR config option X-Git-Tag: tevent-0.9.11~561 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a759b1a3ca0750cf6637f9541ee1109d14707fd8;p=thirdparty%2Fsamba.git s4-build: added LOCALEDIR config option s3 needs dyn_LOCALEDIR --- diff --git a/source4/dynconfig/dynconfig.c b/source4/dynconfig/dynconfig.c index 9fbfed05434..228cbbcfa8f 100644 --- a/source4/dynconfig/dynconfig.c +++ b/source4/dynconfig/dynconfig.c @@ -84,6 +84,7 @@ DEFINE_DYN_CONFIG_PARAM(PIDDIR) DEFINE_DYN_CONFIG_PARAM(NCALRPCDIR) DEFINE_DYN_CONFIG_PARAM(SMB_PASSWD_FILE) DEFINE_DYN_CONFIG_PARAM(PRIVATE_DIR) +DEFINE_DYN_CONFIG_PARAM(LOCALEDIR) /* these are not in s3 */ DEFINE_DYN_CONFIG_PARAM(DATADIR) diff --git a/source4/dynconfig/wscript b/source4/dynconfig/wscript index c2741fd8750..45f79368f9e 100755 --- a/source4/dynconfig/wscript +++ b/source4/dynconfig/wscript @@ -1,6 +1,6 @@ #!/usr/bin/env python -import string, Utils, Options, sys, Build, os +import string, Utils, Options, sys, Build, os, intltool from samba_utils import EXPAND_VARIABLES, os_path_relpath # list of directory options to offer in configure @@ -26,6 +26,7 @@ dyn_cflags = { 'LOCKDIR' : '${LOCALSTATEDIR}/locks', 'PIDDIR' : '${LOCALSTATEDIR}/run', 'DATADIR' : '${DATADIR}', + 'LOCALEDIR' : '${LOCALEDIR}', 'SETUPDIR' : '${DATADIR}/setup', 'WINBINDD_SOCKET_DIR' : '${WINBINDD_SOCKET_DIR}', 'WINBINDD_PRIVILEGED_SOCKET_DIR' : '${WINBINDD_PRIVILEGED_SOCKET_DIR}',