dynconfig: Introduce and expose SAMBA_LIBEXECDIR

Right now the smbspool_krb5_wrapper lives there, but we'll have more
in the future.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/dynconfig/dynconfig.c b/dynconfig/dynconfig.c
index dd4de16e1d40ffeacdcc0db872fffa89e928c0d2..415ccc53c5257a92d796774b924388bfe0c2ea7e 100644 (file)
--- a/dynconfig/dynconfig.c
+++ b/dynconfig/dynconfig.c
@@ -87,6 +87,7 @@ DEFINE_DYN_CONFIG_PARAM(LMHOSTSFILE) /** Statically configured LanMan hosts. **/
 DEFINE_DYN_CONFIG_PARAM(CODEPAGEDIR)
 DEFINE_DYN_CONFIG_PARAM(LIBDIR)
 DEFINE_DYN_CONFIG_PARAM(MODULESDIR)
+DEFINE_DYN_CONFIG_PARAM(SAMBA_LIBEXECDIR)
 DEFINE_DYN_CONFIG_PARAM(SHLIBEXT)
 DEFINE_DYN_CONFIG_PARAM(LOCKDIR)
 DEFINE_DYN_CONFIG_PARAM(STATEDIR) /** Persistent state files. Default LOCKDIR */

diff --git a/dynconfig/dynconfig.h b/dynconfig/dynconfig.h
index 156e63e38acce2e431882069b3c6ddb34d0266e2..72028a8c2e10eb975d94814dc718de5e94b2ff47 100644 (file)
--- a/dynconfig/dynconfig.h
+++ b/dynconfig/dynconfig.h
@@ -38,6 +38,7 @@ DEFINE_DYN_CONFIG_PROTO(LMHOSTSFILE) /** Statically configured LanMan hosts. **/
 DEFINE_DYN_CONFIG_PROTO(CODEPAGEDIR)
 DEFINE_DYN_CONFIG_PROTO(LIBDIR)
 DEFINE_DYN_CONFIG_PROTO(MODULESDIR)
+DEFINE_DYN_CONFIG_PROTO(SAMBA_LIBEXECDIR)
 DEFINE_DYN_CONFIG_PROTO(SHLIBEXT)
 DEFINE_DYN_CONFIG_PROTO(LOCKDIR)
 DEFINE_DYN_CONFIG_PROTO(STATEDIR) /** Persistent state files. Default LOCKDIR */

diff --git a/dynconfig/wscript b/dynconfig/wscript
index f455699f06291bc14352b485d68c62b171fa9082..c62afa25399c86f9b817c218fc4151ef4aaaf4ad 100644 (file)
--- a/dynconfig/wscript
+++ b/dynconfig/wscript
@@ -95,6 +95,11 @@ dynconfig = {
          'FHS-PATH':  '${LIBEXECDIR}',
          'OVERWRITE': True,
     },
+    'SAMBA_LIBEXECDIR' : {
+         'STD-PATH':  '${LIBEXECDIR}/samba',
+         'FHS-PATH':  '${LIBEXECDIR}/samba',
+         'OVERWRITE': True,
+    },
     'DATADIR' : {
          'STD-PATH':  '${DATADIR}',
          'FHS-PATH':  '${DATADIR}',
@@ -373,6 +378,8 @@ def get_override(bld):
                  'PYTHONARCHDIR' : 'bin/python',
                  'BINDIR'        : 'bin',
                  'SBINDIR'       : 'bin',
+                 'LIBEXECDIR'    : 'bin',
+                 'SAMBA_LIBEXECDIR' : 'bin',
                  'CODEPAGEDIR'   : 'codepages',
                  'SCRIPTSBINDIR' : 'source4/scripting/bin',
                  'SETUPDIR'      : 'source4/setup'