diff --git a/configure.in b/configure.in
index bb2684c7..0a5e595b 100644
--- a/configure.in
+++ b/configure.in
@@ -532,7 +532,6 @@ if test "$enable_see" = "yes"; then
 		EL_CONFIG(CONFIG_SEE, [SEE])
 		AC_SUBST(SEE_CFLAGS)
 		AC_SUBST(CONFIG_SEE)
-		disable_spidermonkey=yes
 	else
 		if test -n "$withval" && test "x$withval" != xno; then
 			AC_MSG_ERROR([SEE not found])
@@ -597,9 +596,31 @@ else
 	AC_SUBST(SPIDERMONKEY_CFLAGS)
 fi
 
-AC_SUBST(CONFIG_SPIDERMONKEY)
+if test "$CONFIG_SEE" != yes; then
+	EL_CONFIG(CONFIG_ECMASCRIPT_SMJS, [SpiderMonkey document scripting])
+fi
 
-EL_CONFIG_DEPENDS(CONFIG_ECMASCRIPT, [CONFIG_SEE CONFIG_SPIDERMONKEY], [ECMAScript (JavaScript)])
+AC_SUBST(CONFIG_SPIDERMONKEY)
+AC_SUBST(CONFIG_ECMASCRIPT_SMJS)
+
+EL_CONFIG_DEPENDS(CONFIG_ECMASCRIPT, [CONFIG_SEE CONFIG_ECMASCRIPT_SMJS], [ECMAScript (JavaScript)])
+
+
+dnl ===================================================================
+dnl Optional Spidermonkey-based ECMAScript browser scripting
+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";])
+
+if test "x$CONFIG_SPIDERMONKEY" = xyes &&
+   test "x$CONFIG_SM_SCRIPTING" = xyes; then
+	EL_CONFIG(CONFIG_SM_SCRIPTING, [SpiderMonkey])
+else
+	CONFIG_SM_SCRIPTING=no
+fi
 
 
 dnl ===================================================================
@@ -830,22 +851,6 @@ dnl ===================================================================
 
 EL_CONFIG_RUBY
 
-dnl ===================================================================
-dnl Optional Spidermonkey-based ECMAScript browser scripting
-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";])
-
-if test "x$CONFIG_SPIDERMONKEY" = xyes &&
-   test "x$CONFIG_SM_SCRIPTING" = xyes; then
-	EL_CONFIG(CONFIG_SM_SCRIPTING, [SpiderMonkey])
-else
-	CONFIG_SM_SCRIPTING=no
-fi
-
 dnl ===================================================================
 dnl Setup global scripting
 dnl ===================================================================
diff --git a/src/ecmascript/Makefile b/src/ecmascript/Makefile
index 894a276e..21a4dbe1 100644
--- a/src/ecmascript/Makefile
+++ b/src/ecmascript/Makefile
@@ -2,9 +2,9 @@ top_builddir=../..
 include $(top_builddir)/Makefile.config
 INCLUDES += $(SPIDERMONKEY_CFLAGS)
 
-SUBDIRS-$(CONFIG_SPIDERMONKEY) += spidermonkey
+SUBDIRS-$(CONFIG_ECMASCRIPT_SMJS) += spidermonkey
 SUBDIRS-$(CONFIG_SEE) += see
-OBJS-$(CONFIG_SPIDERMONKEY) += spidermonkey.o
+OBJS-$(CONFIG_ECMASCRIPT_SMJS) += spidermonkey.o
 OBJS-$(CONFIG_SEE) += see.o
 OBJS	= ecmascript.o