tdb: add a 'new_size' helper variable to tdb_expand_file()

[obnox/samba/samba-obnox.git] / dynconfig / wscript

diff --git a/dynconfig/wscript b/dynconfig/wscript
index 374ede27bcd023fa97b16830496ffeaa6f963287..aa4e66e9d8c6d633f4f41e7b515979e8d3d6c28e 100755 (executable)
--- a/dynconfig/wscript
+++ b/dynconfig/wscript
@@ -111,11 +111,6 @@ dynconfig = {
          'FHS-PATH':  '${PYTHONARCHDIR}',
          'OVERWRITE': True,
     },
-    'MODULESDIR' : {
-         'STD-PATH':  '${MODULESDIR}',
-         'FHS-PATH':  '${MODULESDIR}/samba',
-         'OVERWRITE': True,
-    },
     'INCLUDEDIR' : {
          'STD-PATH':  '${INCLUDEDIR}',
          'FHS-PATH':  '${INCLUDEDIR}/samba-4.0',
@@ -133,14 +128,24 @@ dynconfig = {
          'STD-PATH':  '${LIBDIR}/pkgconfig',
          'FHS-PATH':  '${LIBDIR}/pkgconfig',
     },
-    'SWATDIR' : {
-         'STD-PATH':  '${DATADIR}/swat',
-         'FHS-PATH':  '${DATADIR}/samba/swat',
-    },
     'CODEPAGEDIR' : {
          'STD-PATH':  '${DATADIR}/codepages',
          'FHS-PATH':  '${DATADIR}/samba/codepages',
     },
+    'PRIVATELIBDIR' : {
+         'STD-PATH':  '${LIBDIR}/private',
+         'FHS-PATH':  '${LIBDIR}/samba',
+         'OPTION':    '--with-privatelibdir',
+         'HELPTEXT':  'Which directory to use for private Samba libraries',
+         'OVERWRITE': True,
+    },
+    'MODULESDIR' : {
+         'STD-PATH':  '${LIBDIR}',
+         'FHS-PATH':  '${LIBDIR}/samba',
+         'OPTION':    '--with-modulesdir',
+         'HELPTEXT':  'Which directory to use for Samba modules',
+         'OVERWRITE': True,
+    },
     'PAMMODULESDIR' : {
          'STD-PATH':  '${LIBDIR}/security',
          'FHS-PATH':  '${LIBDIR}/security',
@@ -217,8 +222,8 @@ dynconfig = {
          'DELAY':     True,
     },
     'NTP_SIGND_SOCKET_DIR' : {
-         'STD-PATH':  '${SOCKET_DIR}/ntp_signd',
-         'FHS-PATH':  '${SOCKET_DIR}/ntp_signd',
+         'STD-PATH':  '${PRIVILEGED_SOCKET_DIR}/ntp_signd',
+         'FHS-PATH':  '${PRIVILEGED_SOCKET_DIR}/ntp_signd',
          'DELAY':     True,
     },
     'NCALRPCDIR' : {
@@ -247,13 +252,20 @@ def set_options(opt):
     opt.parser.formatter = SambaIndentedHelpFormatter()
     opt.parser.formatter.width=Utils.get_term_cols()
 
+    for k in ('--with-privatelibdir', '--with-modulesdir'):
+        option = opt.parser.get_option(k)
+        if option:
+            opt.parser.remove_option(k)
+    del opt.parser.defaults['PRIVATELIBDIR']
+    del opt.parser.defaults['MODULESDIR']
+
     # get all the basic GNU options from the gnu_dirs tool
 
     opt_group=opt.add_option_group('Samba-specific directory layout','')
 
     fhs_help  = "Use FHS-compliant paths (default no)\n"
     fhs_help += "You should consider using this together with:\n"
-    fhs_help += "--prefix=/usr --sysconfdir=/etc --locatestatedir=/var"
+    fhs_help += "--prefix=/usr --sysconfdir=/etc --localstatedir=/var"
     opt_group.add_option('--enable-fhs', help=fhs_help,
                    action="store_true", dest='ENABLE_FHS', default=False)