diff --git a/configure.in b/configure.in
index 33dca15f..fd43d0e7 100644
--- a/configure.in
+++ b/configure.in
@@ -583,10 +583,9 @@ if test -z "$disable_spidermonkey"; then
 fi
 
 AC_MSG_RESULT($cf_result)
+EL_RESTORE_FLAGS
 
-if test "$cf_result" != yes; then
-	EL_RESTORE_FLAGS
-else
+if test "$cf_result" = yes; then
 	EL_CONFIG(CONFIG_SPIDERMONKEY, [SpiderMonkey])
 
 	CFLAGS="$CFLAGS_X"
@@ -621,6 +620,12 @@ else
 	CONFIG_SCRIPTING_SPIDERMONKEY=no
 fi
 
+EL_CONFIG_DEPENDS(CONFIG_SPIDERMONKEY, [CONFIG_ECMASCRIPT_SMJS CONFIG_SCRIPTING_SPIDERMONKEY], [SpiderMonkey])
+if test "x$CONFIG_SPIDERMONKEY" = xyes; then
+	LIBS="$SPIDERMONKEY_LIBS $LIBS_X"
+	CFLAGS="$CFLAGS_X $SPIDERMONKEY_CFLAGS"
+	CPPFLAGS="$CPPFLAGS_X $SPIDERMONKEY_CFLAGS"
+fi
 
 dnl ===================================================================
 dnl Check for Guile, optional even if installed.