s4:dynconfig/wscript: ${LOCALSTATEDIR} already has var/ included

[samba.git] / source4 / dynconfig / wscript

diff --git a/source4/dynconfig/wscript b/source4/dynconfig/wscript
index 3b645036771f1ff0042b6790af549ba8d2c04d4c..cd80647954085c3cc2a8d71151fd8939d6cdfe92 100644 (file)
--- a/source4/dynconfig/wscript
+++ b/source4/dynconfig/wscript
@@ -1,4 +1,7 @@
-import string, Utils, Options
+#!/usr/bin/env python
+
+import string, Utils, Options, sys
+from samba_utils import EXPAND_VARIABLES
 
 # list of directory options to offer in configure
 dir_options = {
@@ -26,9 +29,32 @@ dyn_cflags = {
     'PRIVATE_DIR'                    : '${PRIVATEDIR}',
     'MODULESDIR'                     : '${PREFIX}/modules',
     'SETUPDIR'                       : '${DATADIR}/setup',
+    'INCLUDEDIR'                     : '${PREFIX}/include',
     'WINBINDD_PRIVILEGED_SOCKET_DIR' : '${WINBINDD_PRIVILEGED_SOCKET_DIR}',
     'WINBINDD_SOCKET_DIR'            : '${WINBINDD_SOCKET_DIR}',
     'NTP_SIGND_SOCKET_DIR'           : '${NTP_SIGND_SOCKET_DIR}',
+    'PKGCONFIGDIR'                   : '${LIBDIR}/pkgconfig',
+    }
+
+# changes for when FHS is enabled
+dyn_cflags_fhs = {
+    'CONFIGDIR'                      : '${SYSCONFDIR}/samba',
+    'CONFIGFILE'                     : '${CONFIGDIR}/smb.conf',
+    'LMHOSTSFILE'                    : '${CONFIGDIR}/lmhosts',
+    'LOCKDIR'                        : '${LOCALSTATEDIR}/lib/samba',
+    'PIDDIR'                         : '${LOCALSTATEDIR}/run/samba',
+    'LOGFILEBASE'                    : '${LOCALSTATEDIR}/log/samba',
+    'PRIVATE_DIR'                    : '${LOCALSTATEDIR}/lib/samba/private',
+    'MODULESDIR'                     : '${LIBDIR}/samba',
+    'DATADIR'                        : '${DATADIR}/samba',
+    'INCLUDEDIR'                     : '${INCLUDEDIR}/samba-4.0',
+    'NTP_SIGND_SOCKET_DIR'           : '${LOCALSTATEDIR}/run/samba/ntp_signd',
+    'WINBINDD_SOCKET_DIR'            : '${LOCALSTATEDIR}/run/samba/winbindd',
+    'WINBINDD_PRIVILEGED_SOCKET_DIR' : '${LOCALSTATEDIR}/run/samba/winbindd_privileged',
+    'NCALRPCDIR'                     : '${LOCALSTATEDIR}/ncalrpc',
+    'SWATDIR'                        : '${DATADIR}/swat',
+    'SETUPDIR'                       : '${DATADIR}/setup',
+    'PKGCONFIGDIR'                   : '${LIBDIR}/pkgconfig',
     }
 
 def get_varname(v):
@@ -36,13 +62,15 @@ 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]
@@ -53,7 +81,6 @@ def set_options(opt):
 
 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)
@@ -61,16 +88,28 @@ def configure(conf):
         conf.ASSERT(varname not in conf.env, "Variable %s already defined" % varname)
         conf.env[varname] = value
 
+    for f in dyn_cflags.keys():
+        v = EXPAND_VARIABLES(conf, dyn_cflags[f])
+        conf.ASSERT(v != '', "Empty dynconfig value for %s" % f)
+        conf.env[f] = v
+
+    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):
     '''work out the extra CFLAGS for dynconfig.c'''
     cflags = []
     for f in dyn_cflags.keys():
-        # substitute twice, as we could have substitutions containing variables
-        v = Utils.subst_vars(dyn_cflags[f], bld.env)
-        v = Utils.subst_vars(v, bld.env)
-        bld.ASSERT(v != '', "Empty dynconfig value for %s" % f)
-        bld.ASSERT(v.find('${') == -1, "Unsubstituted variable in %s : %s : %s" % (f, dyn_cflags[f], v))
-        cflags.append('-D%s="%s"' % (f, v))
+        cflags.append('-D%s="%s"' % (f, bld.env[f]))
     return cflags
 
 def build(bld):
@@ -78,4 +117,7 @@ def build(bld):
     bld.SAMBA_SUBSYSTEM('DYNCONFIG',
                         'dynconfig.c',
                         deps='replace talloc',
+                        public_headers='../version.h',
+                        header_path='samba',
                         cflags=cflags)
+