summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-04-30 18:20:54 +1000
committerAndrew Bartlett <abartlet@samba.org>2010-05-14 23:25:44 +1000
commitba4842a88076133b012cbcef632edb0fb822a56d (patch)
tree62a8084cfda76634e46efd47eefa5969d4189496
parent3b8d9cd87e88ad454322b82eb2490477dbc82d8f (diff)
downloadsamba-ba4842a88076133b012cbcef632edb0fb822a56d.tar.gz
samba-ba4842a88076133b012cbcef632edb0fb822a56d.tar.bz2
samba-ba4842a88076133b012cbcef632edb0fb822a56d.zip
Revert "s4: remove unused references to swat"
This reverts most of commit 1765732f82719a4bc925f21ef4999bd19a8d1f6c. The s3compat build needs the SWAT location to be compatible with Samba3.
-rw-r--r--source4/Makefile.in1
-rw-r--r--source4/dynconfig/config.mk1
-rw-r--r--source4/dynconfig/dynconfig.c3
-rw-r--r--source4/dynconfig/dynconfig.h2
-rw-r--r--source4/dynconfig/wscript2
-rw-r--r--source4/smbd/server.c1
6 files changed, 10 insertions, 0 deletions
diff --git a/source4/Makefile.in b/source4/Makefile.in
index 45f2f16b63..40ea2868dd 100644
--- a/source4/Makefile.in
+++ b/source4/Makefile.in
@@ -11,6 +11,7 @@ include mkconfig.mk
pidldir := $(srcdir)/../pidl
basedir = $(prefix)
+swatdir = $(datadir)/swat
setupdir = $(datadir)/setup
ncalrpcdir = $(localstatedir)/ncalrpc
shliboutputdir = $(builddir)/bin/shared
diff --git a/source4/dynconfig/config.mk b/source4/dynconfig/config.mk
index 0e7408a57e..976ca71742 100644
--- a/source4/dynconfig/config.mk
+++ b/source4/dynconfig/config.mk
@@ -15,6 +15,7 @@ $(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 a56dd3d931..d515bf7a2d 100644
--- a/source4/dynconfig/dynconfig.c
+++ b/source4/dynconfig/dynconfig.c
@@ -76,6 +76,9 @@ _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 de9ff87518..48f8ab628f 100644
--- a/source4/dynconfig/dynconfig.h
+++ b/source4/dynconfig/dynconfig.h
@@ -35,6 +35,8 @@ 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 4a485012e8..1d9a603bdd 100644
--- a/source4/dynconfig/wscript
+++ b/source4/dynconfig/wscript
@@ -34,6 +34,7 @@ dyn_cflags = {
'MODULESDIR' : '${PREFIX}/modules',
'INCLUDEDIR' : '${PREFIX}/include',
'PKGCONFIGDIR' : '${LIBDIR}/pkgconfig',
+ 'SWATDIR' : '${DATADIR}/swat',
}
# changes for when FHS is enabled
@@ -57,6 +58,7 @@ dyn_cflags_fhs = {
'MODULESDIR' : '${LIBDIR}/samba',
'INCLUDEDIR' : '${INCLUDEDIR}/samba-4.0',
'PKGCONFIGDIR' : '${LIBDIR}/pkgconfig',
+ 'SWATDIR' : '${DATADIR}/swat',
}
def get_varname(v):
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 8eea471140..149421532f 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -254,6 +254,7 @@ static void show_build(void)
CONFIG_OPTION(LOCKDIR),
CONFIG_OPTION(PIDDIR),
CONFIG_OPTION(PRIVATE_DIR),
+ CONFIG_OPTION(SWATDIR),
CONFIG_OPTION(SETUPDIR),
CONFIG_OPTION(WINBINDD_SOCKET_DIR),
CONFIG_OPTION(WINBINDD_PRIVILEGED_SOCKET_DIR),