diff --git a/NEWS b/NEWS index 3916c435..61ccd78d 100644 --- a/NEWS +++ b/NEWS @@ -82,7 +82,6 @@ Miscellaneous: * enhancement: Add move-half-page-up and move-half-page-down actions. * enhancement: Add option to change overlap for vertical scrolling. * link against lua51 not lua50 -* configure options to link against libmozjs of xulrunner * using iconv for some multibyte charsets. It works if the terminal codepage is UTF-8. More charsets will be added on demand. diff --git a/configure.in b/configure.in index 2bd68303..a9a08786 100644 --- a/configure.in +++ b/configure.in @@ -623,15 +623,6 @@ fi # Check for SpiderMonkey, optional even if installed. # =================================================================== -xulrunner_includes= -xulrunner_libs= -AC_ARG_WITH(xulrunner_includes, [ --with-xulrunner_includes=DIR - When set, the libmozjs of xulrunner is used instead of "standalone" SpiderMonkey], - [xulrunner_includes="$withval"]) -AC_ARG_WITH(xulrunner_libs, [ --with-xulrunner_libs=OPTIONS - Linker options for xulrunner, - eg. --with-xulrunner_libs="-Wl,-R/usr/lib/xulrunner -L/usr/lib/xulrunner -lmozjs"], - [xulrunner_libs="$withval"]) AC_ARG_WITH(spidermonkey, [ --without-spidermonkey disable SpiderMonkey Mozilla JavaScript engine support], [if test "$withval" = no; then disable_spidermonkey=yes; fi]) @@ -644,49 +635,31 @@ if test -z "$disable_spidermonkey"; then if test ! -d "$withval"; then withval=""; fi - if test ! -z "$xulrunner_includes"; then - SPIDERMONKEY_LIBS="$xulrunner_libs" - SPIDERMONKEY_CFLAGS="-I$xulrunner_includes" - LIBS="$SPIDERMONKEY_LIBS $LIBS_X" - CFLAGS="$CFLAGS_X $SPIDERMONKEY_CFLAGS" - CPPFLAGS="$CPPFLAGS_X $SPIDERMONKEY_CFLAGS" + for spidermonkeydir in "$withval" "" /usr /usr/local /opt/spidermonkey /opt/js; do + for spidermonkeyinclude in "/include" "/include/js" "/include/smjs" "/include/mozjs"; do + for spidermonkeylib in js smjs mozjs; do + if test "$cf_result" = no; then + SPIDERMONKEY_LIBS="-L$spidermonkeydir/lib -l$spidermonkeylib" + SPIDERMONKEY_CFLAGS="-I$spidermonkeydir$spidermonkeyinclude" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define XP_UNIX - #include ]], [[ - #ifndef JS_VERSION - #error JS_VERSION - #endif - #if JS_VERSION < 185 - #error too old - #endif]])], - [cf_result=yes],[cf_result=no]) - else - for spidermonkeydir in "$withval" "" /usr /usr/local /opt/spidermonkey /opt/js; do - for spidermonkeyinclude in "/include" "/include/js" "/include/smjs" "/include/mozjs"; do - for spidermonkeylib in js smjs mozjs; do - if test "$cf_result" = no; then - SPIDERMONKEY_LIBS="-L$spidermonkeydir/lib -l$spidermonkeylib" - SPIDERMONKEY_CFLAGS="-I$spidermonkeydir$spidermonkeyinclude" + LIBS="$SPIDERMONKEY_LIBS $LIBS_X" + CFLAGS="$CFLAGS_X $SPIDERMONKEY_CFLAGS" + CPPFLAGS="$CPPFLAGS_X $SPIDERMONKEY_CFLAGS" - LIBS="$SPIDERMONKEY_LIBS $LIBS_X" - CFLAGS="$CFLAGS_X $SPIDERMONKEY_CFLAGS" - CPPFLAGS="$CPPFLAGS_X $SPIDERMONKEY_CFLAGS" - - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define XP_UNIX - #define XP_UNIX - #include ]], [[ - #ifndef JS_VERSION - #error JS_VERSION - #endif - #if JS_VERSION < 185 - #error too old - #endif]])], - [cf_result=yes],[cf_result=no]) - fi - done + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define XP_UNIX + #define XP_UNIX + #include ]], [[ + #ifndef JS_VERSION + #error JS_VERSION + #endif + #if JS_VERSION < 185 + #error too old + #endif]])], + [cf_result=yes],[cf_result=no]) + fi done done - fi + done fi AC_MSG_RESULT($cf_result)