From a9b8abb70c39e54e57054b3cbdeb233974732998 Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Wed, 11 Jan 2006 14:14:11 +0100
Subject: [PATCH]

---
 Makefile.config.in        |  2 +-
 configure.in              | 12 ++++++------
 features.conf             |  2 +-
 src/scripting/Makefile    |  2 +-
 src/scripting/scripting.c |  4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Makefile.config.in b/Makefile.config.in
index 14f1a53e..10e4330d 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -147,7 +147,7 @@ CONFIG_SEE = @CONFIG_SEE@
 CONFIG_SHA1 = @CONFIG_SHA1@
 CONFIG_SMALL = @CONFIG_SMALL@
 CONFIG_SMB = @CONFIG_SMB@
-CONFIG_SM_SCRIPTING = @CONFIG_SM_SCRIPTING@
+CONFIG_SCRIPTING_SPIDERMONKEY = @CONFIG_SCRIPTING_SPIDERMONKEY@
 CONFIG_SPIDERMONKEY = @CONFIG_SPIDERMONKEY@
 CONFIG_SSL = @CONFIG_SSL@
 CONFIG_SYSMOUSE = @CONFIG_SYSMOUSE@
diff --git a/configure.in b/configure.in
index bdc61091..c55c0d71 100644
--- a/configure.in
+++ b/configure.in
@@ -613,13 +613,13 @@ dnl ===================================================================
 AC_ARG_ENABLE(sm-scripting,
 	      [  --disable-sm-scripting  ECMAScript browser scripting (requires Spidermonkey)],
 	      [if test "$enableval" != no; then enableval="yes"; fi
-	       CONFIG_SM_SCRIPTING="$enableval";])
+	       CONFIG_SCRIPTING_SPIDERMONKEY="$enableval";])
 
 if test "x$CONFIG_SPIDERMONKEY" = xyes &&
-   test "x$CONFIG_SM_SCRIPTING" = xyes; then
-	EL_CONFIG(CONFIG_SM_SCRIPTING, [SpiderMonkey])
+   test "x$CONFIG_SCRIPTING_SPIDERMONKEY" = xyes; then
+	EL_CONFIG(CONFIG_SCRIPTING_SPIDERMONKEY, [SpiderMonkey])
 else
-	CONFIG_SM_SCRIPTING=no
+	CONFIG_SCRIPTING_SPIDERMONKEY=no
 fi
 
 
@@ -855,13 +855,13 @@ dnl ===================================================================
 dnl Setup global scripting
 dnl ===================================================================
 
-EL_CONFIG_DEPENDS(CONFIG_SCRIPTING, [CONFIG_SCRIPTING_GUILE CONFIG_SCRIPTING_LUA CONFIG_SCRIPTING_PERL CONFIG_SCRIPTING_PYTHON CONFIG_SCRIPTING_RUBY CONFIG_SM_SCRIPTING], [Browser scripting])
+EL_CONFIG_DEPENDS(CONFIG_SCRIPTING, [CONFIG_SCRIPTING_GUILE CONFIG_SCRIPTING_LUA CONFIG_SCRIPTING_PERL CONFIG_SCRIPTING_PYTHON CONFIG_SCRIPTING_RUBY CONFIG_SCRIPTING_SPIDERMONKEY], [Browser scripting])
 AC_SUBST(CONFIG_SCRIPTING_GUILE)
 AC_SUBST(CONFIG_SCRIPTING_LUA)
 AC_SUBST(CONFIG_SCRIPTING_PERL)
 AC_SUBST(CONFIG_SCRIPTING_PYTHON)
 AC_SUBST(CONFIG_SCRIPTING_RUBY)
-AC_SUBST(CONFIG_SM_SCRIPTING)
+AC_SUBST(CONFIG_SCRIPTING_SPIDERMONKEY)
 AC_SUBST(CONFIG_SCRIPTING)
 
 
diff --git a/features.conf b/features.conf
index 90a03f33..e725316b 100644
--- a/features.conf
+++ b/features.conf
@@ -408,7 +408,7 @@ CONFIG_HTML_HIGHLIGHT=no
 #
 # Default: enabled if Spidermonkey is found
 
-CONFIG_SM_SCRIPTING=yes
+CONFIG_SCRIPTING_SPIDERMONKEY=yes
 
 
 ### Mouse Support
diff --git a/src/scripting/Makefile b/src/scripting/Makefile
index 162fee44..1d833310 100644
--- a/src/scripting/Makefile
+++ b/src/scripting/Makefile
@@ -6,7 +6,7 @@ SUBDIRS-$(CONFIG_SCRIPTING_LUA)		+= lua
 SUBDIRS-$(CONFIG_SCRIPTING_PERL)		+= perl
 SUBDIRS-$(CONFIG_SCRIPTING_PYTHON)	+= python
 SUBDIRS-$(CONFIG_SCRIPTING_RUBY)		+= ruby
-SUBDIRS-$(CONFIG_SM_SCRIPTING)	+= smjs
+SUBDIRS-$(CONFIG_SCRIPTING_SPIDERMONKEY)	+= smjs
 
 OBJS = scripting.o
 
diff --git a/src/scripting/scripting.c b/src/scripting/scripting.c
index 5593ebd4..6acbb41d 100644
--- a/src/scripting/scripting.c
+++ b/src/scripting/scripting.c
@@ -26,7 +26,7 @@
 
 /* Error reporting. */
 
-#if defined(CONFIG_SCRIPTING_RUBY) || defined(CONFIG_SEE) || defined(CONFIG_SM_SCRIPTING)
+#if defined(CONFIG_SCRIPTING_RUBY) || defined(CONFIG_SEE) || defined(CONFIG_SCRIPTING_SPIDERMONKEY)
 void
 report_scripting_error(struct module *module, struct session *ses,
 		       unsigned char *msg)
@@ -77,7 +77,7 @@ static struct module *scripting_modules[] = {
 #ifdef CONFIG_SCRIPTING_RUBY
 	&ruby_scripting_module,
 #endif
-#ifdef CONFIG_SM_SCRIPTING
+#ifdef CONFIG_SCRIPTING_SPIDERMONKEY
 	&smjs_scripting_module,
 #endif
 	NULL,