Merge branch 'master' of git://git.netsurf-browser.org/netsurf

This commit is contained in:
Michael Drake 2013-09-03 16:15:10 +01:00
commit 80e8465e91

View File

@ -302,8 +302,18 @@ fi
# convert javascript parameters
if [ "${BUILD_JS}" = "json" ];then
BUILD_MOZJS=NO
BUILD_JS=YES
case ${TARGET} in
"riscos")
BUILD_MOZJS=NO
BUILD_JS=YES
;;
*)
BUILD_MOZJS=YES
BUILD_JS=NO
;;
esac
else
BUILD_JS=NO
BUILD_MOZJS=NO