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.

diff --git a/source4/Makefile.in b/source4/Makefile.in
index 45f2f16b632ab5969ec5e97d940c775e5fd1ccbf..40ea2868ddf6b08586a17e1c0d957d7025f634b4 100644 (file)
--- 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 0e7408a57e48a9c3c7f4f905c806616f728b9b88..976ca71742baeec7429b582458f5efb967853c2a 100644 (file)
--- 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 a56dd3d931258c671b19dffa8d319e72b196b456..d515bf7a2d44dbdcd0539e71879fa8ea2234902a 100644 (file)
--- 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 de9ff87518a26d5380b8ee58173c778c2fa318ab..48f8ab628fecec6ed6109358bc0d96ca16989996 100644 (file)
--- 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 4a485012e84bfbc45eabc17c178015745c64af8a..1d9a603bdd9af376e781b9197cfa279b9574e0bd 100644 (file)
--- 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 8eea471140b7f8dd41f3d9c71e2a36ed80c1b895..149421532f2f4fd2bc9d7b9fd6968c017155816a 100644 (file)
--- 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),