r7065: Move ejs from web_server to lib so it can be shared with smbscript.

(This used to be commit b83dc8fbfb9ffe30654bc4869398f50dd9ccccb7)

17 files changed, 29 insertions, 29 deletions

diff --git a/source4/build/smb_build/main.pm b/source4/build/smb_build/main.pm
index 758346b421..98cf9bed6d 100644
--- a/source4/build/smb_build/main.pm
+++ b/source4/build/smb_build/main.pm
@@ -37,6 +37,7 @@ sub smb_build_main($)
 		"lib/popt/config.mk",
 		"lib/cmdline/config.mk",
 		"lib/socket_wrapper/config.mk",
+		"lib/ejs/config.mk",
 		"param/config.mk",
 		"smb_server/config.mk",
 		"rpc_server/config.mk",
diff --git a/source4/web_server/ejs/config.h b/source4/lib/ejs/config.h
index ec350890df..ec350890df 100644
--- a/source4/web_server/ejs/config.h
+++ b/source4/lib/ejs/config.h
diff --git a/source4/lib/ejs/config.mk b/source4/lib/ejs/config.mk
new file mode 100644
index 0000000000..2d436cbe0b
--- /dev/null
+++ b/source4/lib/ejs/config.mk
@@ -0,0 +1,13 @@
+#######################
+# Start SUBSYSTEM EJS
+[SUBSYSTEM::EJS]
+ADD_OBJ_FILES = \
+		lib/ejs/ejs.o  \
+		lib/ejs/ejsLex.o \
+		lib/ejs/ejsParser.o \
+		lib/ejs/ejsProcs.o \
+		lib/ejs/miniMpr.o \
+		lib/ejs/var.o
+NOPROTO=YES
+# End SUBSYSTEM EJS
+#######################
diff --git a/source4/web_server/ejs/ejs.c b/source4/lib/ejs/ejs.c
index 49bb9a6649..41af795370 100644
--- a/source4/web_server/ejs/ejs.c
+++ b/source4/lib/ejs/ejs.c
@@ -35,7 +35,7 @@
  */
 /********************************** Includes **********************************/
 
-#include "web_server/ejs/ejsInternal.h"
+#include "lib/ejs/ejsInternal.h"
 
 #if BLD_FEATURE_EJS
 
diff --git a/source4/web_server/ejs/ejs.h b/source4/lib/ejs/ejs.h
index 987810ad06..79216d4712 100644
--- a/source4/web_server/ejs/ejs.h
+++ b/source4/lib/ejs/ejs.h
@@ -44,8 +44,8 @@
 #ifndef _h_EJS
 #define _h_EJS 1
 
-#include	"web_server/ejs/miniMpr.h"
-#include	"web_server/ejs/var.h"
+#include	"lib/ejs/miniMpr.h"
+#include	"lib/ejs/var.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source4/web_server/ejs/ejsInternal.h b/source4/lib/ejs/ejsInternal.h
index d5d5760812..4d54c4e8c6 100644
--- a/source4/web_server/ejs/ejsInternal.h
+++ b/source4/lib/ejs/ejsInternal.h
@@ -39,7 +39,7 @@
 #ifndef _h_EJS_INTERNAL
 #define _h_EJS_INTERNAL 1
 
-#include		"web_server/ejs/ejs.h"
+#include		"lib/ejs/ejs.h"
 
 /********************************** Defines ***********************************/
 
diff --git a/source4/web_server/ejs/ejsLex.c b/source4/lib/ejs/ejsLex.c
index 24e48d5ac3..b0d6483c2a 100644
--- a/source4/web_server/ejs/ejsLex.c
+++ b/source4/lib/ejs/ejsLex.c
@@ -36,7 +36,7 @@
  */
 /********************************** Includes **********************************/
 
-#include	"web_server/ejs/ejsInternal.h"
+#include	"lib/ejs/ejsInternal.h"
 
 #if BLD_FEATURE_EJS
 
diff --git a/source4/web_server/ejs/ejsParser.c b/source4/lib/ejs/ejsParser.c
index a7d27fb0c9..f9335ec004 100644
--- a/source4/web_server/ejs/ejsParser.c
+++ b/source4/lib/ejs/ejsParser.c
@@ -35,7 +35,7 @@
 
 /********************************** Includes **********************************/
 
-#include	"web_server/ejs/ejsInternal.h"
+#include	"lib/ejs/ejsInternal.h"
 
 #if BLD_FEATURE_EJS
 
diff --git a/source4/web_server/ejs/ejsProcs.c b/source4/lib/ejs/ejsProcs.c
index 163835ed6e..39df18ef94 100644
--- a/source4/web_server/ejs/ejsProcs.c
+++ b/source4/lib/ejs/ejsProcs.c
@@ -34,7 +34,7 @@
  */
 /********************************** Includes **********************************/
 
-#include	"web_server/ejs/ejsInternal.h"
+#include	"lib/ejs/ejsInternal.h"
 
 #if BLD_FEATURE_EJS
 
diff --git a/source4/web_server/ejs/miniMpr.c b/source4/lib/ejs/miniMpr.c
index 311f2defeb..2c6f7bea50 100644
--- a/source4/web_server/ejs/miniMpr.c
+++ b/source4/lib/ejs/miniMpr.c
@@ -29,7 +29,7 @@
  *	@end
  */
 
-#include	"web_server/ejs/miniMpr.h"
+#include	"lib/ejs/miniMpr.h"
 
 /************************************ Code ************************************/
 #if !BLD_APPWEB
diff --git a/source4/web_server/ejs/miniMpr.h b/source4/lib/ejs/miniMpr.h
index b34fb2e293..b34fb2e293 100644
--- a/source4/web_server/ejs/miniMpr.h
+++ b/source4/lib/ejs/miniMpr.h
diff --git a/source4/web_server/ejs/mprOs.h b/source4/lib/ejs/mprOs.h
index 5a88f4f8af..c88a3e3c43 100644
--- a/source4/web_server/ejs/mprOs.h
+++ b/source4/lib/ejs/mprOs.h
@@ -42,7 +42,7 @@ blah blah;
 #ifndef _h_MPR_OS_HDRS
 #define _h_MPR_OS_HDRS 1
 
-#include	"web_server/ejs/config.h"
+#include	"lib/ejs/config.h"
 
 ////////////////////////////////// CPU Families ////////////////////////////////
 //
diff --git a/source4/web_server/ejs/var.c b/source4/lib/ejs/var.c
index ca8eb0fb2a..5df306797d 100644
--- a/source4/web_server/ejs/var.c
+++ b/source4/lib/ejs/var.c
@@ -44,7 +44,7 @@
 
 /********************************** Includes **********************************/
 
-#include	"web_server/ejs/var.h"
+#include	"lib/ejs/var.h"
 
 /*********************************** Locals ***********************************/
 #if VAR_DEBUG
diff --git a/source4/web_server/ejs/var.h b/source4/lib/ejs/var.h
index 2e8fdf6b58..1f9ab65aa7 100644
--- a/source4/web_server/ejs/var.h
+++ b/source4/lib/ejs/var.h
@@ -56,7 +56,7 @@
 
 /********************************* Includes ***********************************/
 
-#include	"web_server/ejs/miniMpr.h"
+#include	"lib/ejs/miniMpr.h"
 
 /********************************** Defines ***********************************/
 
diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 1c823a4d8e..f1ff03ae49 100644
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "web_server/ejs/ejs.h"
+#include "lib/ejs/ejs.h"
 
 void http_exception(const char *reason)
 {
diff --git a/source4/web_server/config.mk b/source4/web_server/config.mk
index bcb5bea0ff..00f29101b2 100644
--- a/source4/web_server/config.mk
+++ b/source4/web_server/config.mk
@@ -1,20 +1,6 @@
 # web server subsystem
 
 #######################
-# Start SUBSYSTEM EJS
-[SUBSYSTEM::EJS]
-ADD_OBJ_FILES = \
-		web_server/ejs/ejs.o  \
-		web_server/ejs/ejsLex.o \
-		web_server/ejs/ejsParser.o \
-		web_server/ejs/ejsProcs.o \
-		web_server/ejs/miniMpr.o \
-		web_server/ejs/var.o
-NOPROTO=YES
-# End SUBSYSTEM EJS
-#######################
-
-#######################
 # Start SUBSYSTEM ESP
 [SUBSYSTEM::ESP]
 ADD_OBJ_FILES = \
diff --git a/source4/web_server/esp/esp.h b/source4/web_server/esp/esp.h
index ff4210befa..886174dce8 100644
--- a/source4/web_server/esp/esp.h
+++ b/source4/web_server/esp/esp.h
@@ -36,10 +36,10 @@
 #ifndef _h_ESP_h
 #define _h_ESP_h 1
 
-#include	"web_server/ejs/ejs.h"
+#include	"lib/ejs/ejs.h"
 #include	"web_server/esp/espEnv.h"
-#include	"web_server/ejs/var.h"
-#include	"web_server/ejs/miniMpr.h"
+#include	"lib/ejs/var.h"
+#include	"lib/ejs/miniMpr.h"
 
 /*********************************** Defines **********************************/