VERSION: Bump version number up to 4.0.4.

[samba.git] / dynconfig / wscript

diff --git a/dynconfig/wscript b/dynconfig/wscript
index 062832604305c3afabd97865ba8a1bd49db77584..d1c7a00f77a292ce366226c12cee691395daf783 100755 (executable)
--- a/dynconfig/wscript
+++ b/dynconfig/wscript
@@ -136,6 +136,13 @@ dynconfig = {
          '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',
@@ -219,8 +226,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' : {
@@ -249,10 +256,12 @@ def set_options(opt):
     opt.parser.formatter = SambaIndentedHelpFormatter()
     opt.parser.formatter.width=Utils.get_term_cols()
 
-    for k in ('--with-modulesdir'):
+    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
 
@@ -260,7 +269,7 @@ def set_options(opt):
 
     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)