1
0
mirror of https://github.com/rkd77/elinks.git synced 2024-09-27 02:56:18 -04:00
This commit is contained in:
Laurent MONIN 2006-01-11 14:14:11 +01:00 committed by Laurent MONIN
parent 52537b6733
commit a9b8abb70c
5 changed files with 11 additions and 11 deletions

View File

@ -147,7 +147,7 @@ CONFIG_SEE = @CONFIG_SEE@
CONFIG_SHA1 = @CONFIG_SHA1@ CONFIG_SHA1 = @CONFIG_SHA1@
CONFIG_SMALL = @CONFIG_SMALL@ CONFIG_SMALL = @CONFIG_SMALL@
CONFIG_SMB = @CONFIG_SMB@ CONFIG_SMB = @CONFIG_SMB@
CONFIG_SM_SCRIPTING = @CONFIG_SM_SCRIPTING@ CONFIG_SCRIPTING_SPIDERMONKEY = @CONFIG_SCRIPTING_SPIDERMONKEY@
CONFIG_SPIDERMONKEY = @CONFIG_SPIDERMONKEY@ CONFIG_SPIDERMONKEY = @CONFIG_SPIDERMONKEY@
CONFIG_SSL = @CONFIG_SSL@ CONFIG_SSL = @CONFIG_SSL@
CONFIG_SYSMOUSE = @CONFIG_SYSMOUSE@ CONFIG_SYSMOUSE = @CONFIG_SYSMOUSE@

View File

@ -613,13 +613,13 @@ dnl ===================================================================
AC_ARG_ENABLE(sm-scripting, AC_ARG_ENABLE(sm-scripting,
[ --disable-sm-scripting ECMAScript browser scripting (requires Spidermonkey)], [ --disable-sm-scripting ECMAScript browser scripting (requires Spidermonkey)],
[if test "$enableval" != no; then enableval="yes"; fi [if test "$enableval" != no; then enableval="yes"; fi
CONFIG_SM_SCRIPTING="$enableval";]) CONFIG_SCRIPTING_SPIDERMONKEY="$enableval";])
if test "x$CONFIG_SPIDERMONKEY" = xyes && if test "x$CONFIG_SPIDERMONKEY" = xyes &&
test "x$CONFIG_SM_SCRIPTING" = xyes; then test "x$CONFIG_SCRIPTING_SPIDERMONKEY" = xyes; then
EL_CONFIG(CONFIG_SM_SCRIPTING, [SpiderMonkey]) EL_CONFIG(CONFIG_SCRIPTING_SPIDERMONKEY, [SpiderMonkey])
else else
CONFIG_SM_SCRIPTING=no CONFIG_SCRIPTING_SPIDERMONKEY=no
fi fi
@ -855,13 +855,13 @@ dnl ===================================================================
dnl Setup global scripting dnl Setup global scripting
dnl =================================================================== 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_GUILE)
AC_SUBST(CONFIG_SCRIPTING_LUA) AC_SUBST(CONFIG_SCRIPTING_LUA)
AC_SUBST(CONFIG_SCRIPTING_PERL) AC_SUBST(CONFIG_SCRIPTING_PERL)
AC_SUBST(CONFIG_SCRIPTING_PYTHON) AC_SUBST(CONFIG_SCRIPTING_PYTHON)
AC_SUBST(CONFIG_SCRIPTING_RUBY) AC_SUBST(CONFIG_SCRIPTING_RUBY)
AC_SUBST(CONFIG_SM_SCRIPTING) AC_SUBST(CONFIG_SCRIPTING_SPIDERMONKEY)
AC_SUBST(CONFIG_SCRIPTING) AC_SUBST(CONFIG_SCRIPTING)

View File

@ -408,7 +408,7 @@ CONFIG_HTML_HIGHLIGHT=no
# #
# Default: enabled if Spidermonkey is found # Default: enabled if Spidermonkey is found
CONFIG_SM_SCRIPTING=yes CONFIG_SCRIPTING_SPIDERMONKEY=yes
### Mouse Support ### Mouse Support

View File

@ -6,7 +6,7 @@ SUBDIRS-$(CONFIG_SCRIPTING_LUA) += lua
SUBDIRS-$(CONFIG_SCRIPTING_PERL) += perl SUBDIRS-$(CONFIG_SCRIPTING_PERL) += perl
SUBDIRS-$(CONFIG_SCRIPTING_PYTHON) += python SUBDIRS-$(CONFIG_SCRIPTING_PYTHON) += python
SUBDIRS-$(CONFIG_SCRIPTING_RUBY) += ruby SUBDIRS-$(CONFIG_SCRIPTING_RUBY) += ruby
SUBDIRS-$(CONFIG_SM_SCRIPTING) += smjs SUBDIRS-$(CONFIG_SCRIPTING_SPIDERMONKEY) += smjs
OBJS = scripting.o OBJS = scripting.o

View File

@ -26,7 +26,7 @@
/* Error reporting. */ /* 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 void
report_scripting_error(struct module *module, struct session *ses, report_scripting_error(struct module *module, struct session *ses,
unsigned char *msg) unsigned char *msg)
@ -77,7 +77,7 @@ static struct module *scripting_modules[] = {
#ifdef CONFIG_SCRIPTING_RUBY #ifdef CONFIG_SCRIPTING_RUBY
&ruby_scripting_module, &ruby_scripting_module,
#endif #endif
#ifdef CONFIG_SM_SCRIPTING #ifdef CONFIG_SCRIPTING_SPIDERMONKEY
&smjs_scripting_module, &smjs_scripting_module,
#endif #endif
NULL, NULL,