-import string, Utils, Options
+#!/usr/bin/env python
+
+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
dir_options = {
# list of cflags to use for dynconfig.c
dyn_cflags = {
- 'CONFIGFILE' : '${SYSCONFDIR}/smb.conf',
'BINDIR' : '${BINDIR}',
'SBINDIR' : '${SBINDIR}',
+ 'SCRIPTSBINDIR' : '${SBINDIR}',
+ 'CONFIGDIR' : '${SYSCONFDIR}',
+ 'CONFIGFILE' : '${SYSCONFDIR}/smb.conf',
'LMHOSTSFILE' : '${SYSCONFDIR}/lmhosts',
+ 'PRIVATE_DIR' : '${PRIVATEDIR}',
+ 'LOGFILEBASE' : '${LOCALSTATEDIR}',
'LOCKDIR' : '${LOCALSTATEDIR}/locks',
'PIDDIR' : '${LOCALSTATEDIR}/run',
'DATADIR' : '${DATADIR}',
- 'LOGFILEBASE' : '${LOCALSTATEDIR}',
- 'CONFIGDIR' : '${SYSCONFDIR}',
- 'NCALRPCDIR' : '${LOCALSTATEDIR}/ncalrpc',
- 'SWATDIR' : '${DATADIR}/swat',
- 'PRIVATE_DIR' : '${PRIVATEDIR}',
- 'MODULESDIR' : '${PREFIX}/modules',
+ 'LOCALEDIR' : '${LOCALEDIR}',
'SETUPDIR' : '${DATADIR}/setup',
- 'INCLUDEDIR' : '${PREFIX}/include',
- 'WINBINDD_PRIVILEGED_SOCKET_DIR' : '${WINBINDD_PRIVILEGED_SOCKET_DIR}',
'WINBINDD_SOCKET_DIR' : '${WINBINDD_SOCKET_DIR}',
+ 'WINBINDD_PRIVILEGED_SOCKET_DIR' : '${WINBINDD_PRIVILEGED_SOCKET_DIR}',
'NTP_SIGND_SOCKET_DIR' : '${NTP_SIGND_SOCKET_DIR}',
+ 'NCALRPCDIR' : '${LOCALSTATEDIR}/ncalrpc',
+ 'PYTHONDIR' : '${PYTHONDIR}',
+ 'PYTHONARCHDIR' : '${PYTHONARCHDIR}',
+ 'MODULESDIR' : '${PREFIX}/modules',
+ 'INCLUDEDIR' : '${PREFIX}/include',
+ 'PKGCONFIGDIR' : '${LIBDIR}/pkgconfig',
+ 'SWATDIR' : '${DATADIR}/swat',
+ 'CODEPAGEDIR' : '${LIBDIR}/samba',
+ 'LIBDIR' : '${LIBDIR}',
+ 'LIBEXECDIR' : '${MODULESDIR}',
+ 'STATEDIR' : '${LOCALSTATEDIR}',
+ 'CACHEDIR' : '${LOCKDIR}',
+ 'SMB_PASSWD_FILE' : '${PRIVATEDIR}/smbpasswd',
+ 'NMBDSOCKETDIR' : '${LOCALSTATEDIR}/nmbd',
+ }
+
+# changes for when FHS is enabled
+dyn_cflags_fhs = {
+ 'BINDIR' : '${BINDIR}',
+ 'SBINDIR' : '${SBINDIR}',
+ 'SCRIPTSBINDIR' : '${SBINDIR}',
+ 'CONFIGDIR' : '${SYSCONFDIR}/samba',
+ 'CONFIGFILE' : '${SYSCONFDIR}/samba/smb.conf',
+ 'LMHOSTSFILE' : '${SYSCONFDIR}/samba/lmhosts',
+ 'PRIVATE_DIR' : '${LOCALSTATEDIR}/lib/samba/private',
+ 'LOGFILEBASE' : '${LOCALSTATEDIR}/log/samba',
+ 'LOCKDIR' : '${LOCALSTATEDIR}/lib/samba',
+ 'PIDDIR' : '${LOCALSTATEDIR}/run/samba',
+ 'SETUPDIR' : '${DATADIR}/samba/setup',
+ 'WINBINDD_SOCKET_DIR' : '${LOCALSTATEDIR}/run/samba/winbindd',
+ 'WINBINDD_PRIVILEGED_SOCKET_DIR' : '${LOCALSTATEDIR}/run/samba/winbindd_privileged',
+ 'NTP_SIGND_SOCKET_DIR' : '${LOCALSTATEDIR}/run/samba/ntp_signd',
+ 'NCALRPCDIR' : '${LOCALSTATEDIR}/run/samba/ncalrpc',
+ 'PYTHONARCHDIR' : '${PYTHONARCHDIR}',
+ 'MODULESDIR' : '${LIBDIR}/samba',
+ 'LIBEXECDIR' : '${MODULESDIR}',
+ 'INCLUDEDIR' : '${INCLUDEDIR}/samba-4.0',
+ 'PKGCONFIGDIR' : '${LIBDIR}/pkgconfig',
+ 'SWATDIR' : '${DATADIR}/swat',
+ 'CODEPAGEDIR' : '${DATADIR}/samba',
+ 'NMBDSOCKETDIR' : '${LOCALSTATEDIR}/run/samba/nmbd',
}
def get_varname(v):
if v.startswith('with-'):
v = v[5:]
v = v.upper()
- v = string.replace(v, '-', '_')
+ v = v.replace('-', '_')
return v
def set_options(opt):
# get all the basic GNU options from the gnu_dirs tool
- opt.tool_options('gnu_dirs')
+ opt.add_option('--enable-fhs',
+ help=("Use FHS-compliant paths (default no)"),
+ action="store_true", dest='ENABLE_FHS', default=False)
for option in dir_options.keys():
default = dir_options[option][0]
help = dir_options[option][1]
def configure(conf):
# get all the basic GNU options from the gnu_dirs tool
- conf.check_tool('gnu_dirs')
for option in dir_options.keys():
varname = get_varname(option)
value = getattr(Options.options, varname, None)
conf.env[varname] = value
for f in dyn_cflags.keys():
- # substitute twice, as we could have substitutions containing variables
- v = Utils.subst_vars(dyn_cflags[f], conf.env)
- v = Utils.subst_vars(v, conf.env)
+ v = EXPAND_VARIABLES(conf, dyn_cflags[f])
conf.ASSERT(v != '', "Empty dynconfig value for %s" % f)
- conf.ASSERT(v.find('${') == -1, "Unsubstituted variable in %s : %s : %s" % (f, dyn_cflags[f], v))
conf.env[f] = v
-def dynconfig_cflags(bld):
+ if Options.options.ENABLE_FHS:
+ for f in dyn_cflags_fhs.keys():
+ v = EXPAND_VARIABLES(conf, dyn_cflags_fhs[f])
+ conf.ASSERT(v != '', "Empty dynconfig value for %s" % f)
+ conf.env[f] = v
+
+ if (not Options.options.ENABLE_FHS and
+ (conf.env.PREFIX == '/usr' or conf.env.PREFIX == '/usr/local')):
+ print("ERROR: Don't install directly under /usr or /usr/local without using the FHS option (--enable-fhs)")
+ sys.exit(1)
+
+
+def dynconfig_cflags(bld, list=None):
'''work out the extra CFLAGS for dynconfig.c'''
cflags = []
+ # override some paths when running from the build directory
+ override = { 'MODULESDIR' : 'bin/modules',
+ 'PYTHONDIR' : 'bin/python',
+ 'PYTHONARCHDIR' : 'bin/python',
+ 'CODEPAGEDIR' : os.path.join(bld.env.srcdir, 'codepages'),
+ 'SCRIPTSBINDIR' : os.path.join(bld.env.srcdir, 'source4/scripting/bin'),
+ 'SETUPDIR' : os.path.join(bld.env.srcdir, 'source4/setup') }
for f in dyn_cflags.keys():
- cflags.append('-D%s="%s"' % (f, bld.env[f]))
+ if list and not f in list:
+ continue
+ value = bld.env[f]
+ if not Options.is_install:
+ if f in override:
+ value = os.path.join(os.getcwd(), override[f])
+ cflags.append('-D%s="%s"' % (f, value))
return cflags
+Build.BuildContext.dynconfig_cflags = dynconfig_cflags
def build(bld):
- cflags = dynconfig_cflags(bld)
+ cflags = bld.dynconfig_cflags()
bld.SAMBA_SUBSYSTEM('DYNCONFIG',
- 'dynconfig.c',
+ '../../dynconfig/dynconfig.c',
deps='replace talloc',
- public_headers='../version.h',
+ public_headers=os_path_relpath(os.path.join(Options.launch_dir, 'version.h'), bld.curdir),
header_path='samba',
cflags=cflags)
git.samba.org / sfrench / samba-autobuild / .git / blobdiff