diff options
Diffstat (limited to 'dynconfig')
| -rw-r--r-- | dynconfig/config.m4 | 3 | ||||
| -rw-r--r-- | dynconfig/dynconfig.c | 1 | ||||
| -rw-r--r-- | dynconfig/dynconfig.h | 1 | ||||
| -rwxr-xr-x | dynconfig/wscript | 4 |
4 files changed, 0 insertions, 9 deletions
diff --git a/dynconfig/config.m4 b/dynconfig/config.m4 index 6b5dfdbadd..fe69abeee4 100644 --- a/dynconfig/config.m4 +++ b/dynconfig/config.m4 @@ -27,7 +27,6 @@ if test x$enable_fhs != xyes; then INCLUDEDIR="${includedir}" SETUPDIR="${datadir}/setup" PKGCONFIGDIR="${libdir}/pkgconfig" - SWATDIR="${datadir}/swat" CODEPAGEDIR="${datadir}/codepages" PAMMODULESDIR="${libdir}/security" CONFIGDIR="\${sysconfdir}" @@ -46,7 +45,6 @@ else INCLUDEDIR="${includedir}/samba-4.0" SETUPDIR="${datadir}/samba/setup" PKGCONFIGDIR="${libdir}/pkgconfig" - SWATDIR="${datadir}/samba/swat" CODEPAGEDIR="${datadir}/samba/codepages" PAMMODULESDIR="${libdir}/security" CONFIGDIR="\${sysconfdir}/samba" @@ -279,7 +277,6 @@ AC_SUBST(MODULESDIR) AC_SUBST(INCLUDEDIR) AC_SUBST(SETUPDIR) AC_SUBST(PKGCONFIGDIR) -AC_SUBST(SWATDIR) AC_SUBST(CODEPAGEDIR) AC_SUBST(PAMMODULESDIR) AC_SUBST(CONFIGDIR) diff --git a/dynconfig/dynconfig.c b/dynconfig/dynconfig.c index 79332a226d..9fd7108da4 100644 --- a/dynconfig/dynconfig.c +++ b/dynconfig/dynconfig.c @@ -86,7 +86,6 @@ const char *set_dyn_##name(const char *newpath) \ /* these are in common with s3 */ DEFINE_DYN_CONFIG_PARAM(SBINDIR) DEFINE_DYN_CONFIG_PARAM(BINDIR) -DEFINE_DYN_CONFIG_PARAM(SWATDIR) DEFINE_DYN_CONFIG_PARAM(CONFIGFILE) /**< Location of smb.conf file. **/ DEFINE_DYN_CONFIG_PARAM(LOGFILEBASE) /** Log file directory. **/ DEFINE_DYN_CONFIG_PARAM(LMHOSTSFILE) /** Statically configured LanMan hosts. **/ diff --git a/dynconfig/dynconfig.h b/dynconfig/dynconfig.h index e53cd8ff5f..4d24001fcb 100644 --- a/dynconfig/dynconfig.h +++ b/dynconfig/dynconfig.h @@ -33,7 +33,6 @@ bool is_default_dyn_##name(void); /* these are in common with s3 */ DEFINE_DYN_CONFIG_PROTO(SBINDIR) DEFINE_DYN_CONFIG_PROTO(BINDIR) -DEFINE_DYN_CONFIG_PROTO(SWATDIR) DEFINE_DYN_CONFIG_PROTO(CONFIGFILE) /**< Location of smb.conf file. **/ DEFINE_DYN_CONFIG_PROTO(LOGFILEBASE) /** Log file directory. **/ DEFINE_DYN_CONFIG_PROTO(LMHOSTSFILE) /** Statically configured LanMan hosts. **/ diff --git a/dynconfig/wscript b/dynconfig/wscript index d1c7a00f77..aa4e66e9d8 100755 --- a/dynconfig/wscript +++ b/dynconfig/wscript @@ -128,10 +128,6 @@ 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', |