diff options
| author | Stefan Metzmacher <metze@samba.org> | 2010-04-29 07:51:32 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2010-04-29 12:36:47 +0200 |
| commit | 1765732f82719a4bc925f21ef4999bd19a8d1f6c (patch) | |
| tree | b127164d625a3cccff271e63e85b09b72fd4992f /source4/dynconfig | |
| parent | 8e792d7b9bd1f9ce35fdaf6db4fc1d08e2ba8bda (diff) | |
| download | samba-1765732f82719a4bc925f21ef4999bd19a8d1f6c.tar.gz samba-1765732f82719a4bc925f21ef4999bd19a8d1f6c.tar.bz2 samba-1765732f82719a4bc925f21ef4999bd19a8d1f6c.zip | |
s4: remove unused references to swat
metze
Diffstat (limited to 'source4/dynconfig')
| -rw-r--r-- | source4/dynconfig/config.mk | 1 | ||||
| -rw-r--r-- | source4/dynconfig/dynconfig.c | 3 | ||||
| -rw-r--r-- | source4/dynconfig/dynconfig.h | 2 | ||||
| -rw-r--r-- | source4/dynconfig/wscript | 2 |
4 files changed, 0 insertions, 8 deletions
diff --git a/source4/dynconfig/config.mk b/source4/dynconfig/config.mk index 976ca71742..0e7408a57e 100644 --- a/source4/dynconfig/config.mk +++ b/source4/dynconfig/config.mk @@ -15,7 +15,6 @@ $(dynconfigsrcdir)/dynconfig.o: CFLAGS+=-DCONFIGFILE=\"$(CONFIG4FILE)\" -DBINDIR -DLOCKDIR=\"$(lockdir)\" -DPIDDIR=\"$(piddir)\" -DDATADIR=\"$(datadir)\" \ -DLOGFILEBASE=\"$(logfilebase)\" \ -DCONFIGDIR=\"$(sysconfdir)\" -DNCALRPCDIR=\"$(ncalrpcdir)\" \ - -DSWATDIR=\"$(swatdir)\" \ -DPRIVATE_DIR=\"$(privatedir)\" \ -DMODULESDIR=\"$(modulesdir)\" \ -DSETUPDIR=\"$(setupdir)\" \ diff --git a/source4/dynconfig/dynconfig.c b/source4/dynconfig/dynconfig.c index d515bf7a2d..a56dd3d931 100644 --- a/source4/dynconfig/dynconfig.c +++ b/source4/dynconfig/dynconfig.c @@ -76,9 +76,6 @@ _PUBLIC_ const char *dyn_PIDDIR = PIDDIR; /** Private data directory; holds ldb files and the like */ _PUBLIC_ const char *dyn_PRIVATE_DIR = PRIVATE_DIR; -/** SWAT directory */ -_PUBLIC_ const char *dyn_SWATDIR = SWATDIR; - /** SETUP files (source files used by the provision) */ _PUBLIC_ const char *dyn_SETUPDIR = SETUPDIR; diff --git a/source4/dynconfig/dynconfig.h b/source4/dynconfig/dynconfig.h index 48f8ab628f..de9ff87518 100644 --- a/source4/dynconfig/dynconfig.h +++ b/source4/dynconfig/dynconfig.h @@ -35,8 +35,6 @@ extern const char *dyn_MODULESDIR; extern const char *dyn_LOCKDIR; extern const char *dyn_PIDDIR; extern const char *dyn_PRIVATE_DIR; -extern const char *dyn_SWATDIR; -extern const char *dyn_JSDIR; extern const char *dyn_SETUPDIR; extern const char *dyn_WINBINDD_SOCKET_DIR; extern const char *dyn_WINBINDD_PRIVILEGED_SOCKET_DIR; diff --git a/source4/dynconfig/wscript b/source4/dynconfig/wscript index 1d9a603bdd..4a485012e8 100644 --- a/source4/dynconfig/wscript +++ b/source4/dynconfig/wscript @@ -34,7 +34,6 @@ dyn_cflags = { 'MODULESDIR' : '${PREFIX}/modules', 'INCLUDEDIR' : '${PREFIX}/include', 'PKGCONFIGDIR' : '${LIBDIR}/pkgconfig', - 'SWATDIR' : '${DATADIR}/swat', } # changes for when FHS is enabled @@ -58,7 +57,6 @@ dyn_cflags_fhs = { 'MODULESDIR' : '${LIBDIR}/samba', 'INCLUDEDIR' : '${INCLUDEDIR}/samba-4.0', 'PKGCONFIGDIR' : '${LIBDIR}/pkgconfig', - 'SWATDIR' : '${DATADIR}/swat', } def get_varname(v): |