From ec7869c7226823e6f44bc7e197dc42419dbe79a8 Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Fri, 11 Sep 2020 21:05:26 +0200 Subject: [PATCH] [meson] Disable spidermonkey (not in Debian), enabled bittorent. --- meson.build | 9 +++++++-- meson_options.txt | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index dc2110b6..fb7e78b4 100644 --- a/meson.build +++ b/meson.build @@ -92,8 +92,11 @@ conf_data.set('CONFIG_LIBDOM', get_option('libdom')) #CONFIG_XBEL_BOOKMARKS=true #CONFIG_COOKIES=true #CONFIG_DOM=true -conf_data.set('CONFIG_ECMASCRIPT', true) -#CONFIG_ECMASCRIPT_SMJS', true) +if conf_data.get('CONFIG_SCRIPTING_SPIDERMONKEY') or conf_data.get('CONFIG_ECMASCRIPT_SMJS') + conf_data.set('CONFIG_ECMASCRIPT', true) +else + conf_data.set('CONFIG_ECMASCRIPT', false) +endif conf_data.set('CONFIG_ECMASCRIPT_SMJS_HEARTBEAT', true) #CONFIG_FORMHIST', true) #CONFIG_GLOBHIST', true) @@ -712,6 +715,7 @@ sysconfdir = get_option('prefix') / get_option('sysconfdir')/'elinks' conf_data.set('CONFDIR', sysconfdir) conf_data.set('sysconfdir', sysconfdir) conf_data.set('SOMETHING', '@SOMETHING@') +conf_data.set('api_srcdir', srcdir + '/src') conf_data.set('LIBDIR', get_option('prefix') / 'lib') conf_data.set('LOCALEDIR', get_option('prefix') / 'share/locale') @@ -754,3 +758,4 @@ configure_file(input : 'config2.h.in', subdir('po') subdir('src') subdir('contrib') +#subdir('doc') diff --git a/meson_options.txt b/meson_options.txt index 8358a380..65b3601d 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,7 +1,7 @@ option('largefile', type: 'boolean', value: true, description: 'support for large files') option('bookmarks', type: 'boolean', value: true, description: 'bookmark support') option('xbel', type: 'boolean', value: true, description: 'XBEL bookmark support (requires expat)') -option('sm-scripting', type: 'boolean', value: true, description: 'ECMAScript browser scripting (requires Spidermonkey)') +option('sm-scripting', type: 'boolean', value: false, description: 'ECMAScript browser scripting (requires Spidermonkey)') option('nls', type: 'boolean', value: true, description: 'Native Language Support') option('cookies', type: 'boolean', value: true, description: 'cookie support') option('formhist', type: 'boolean', value: true, description: 'form history support') @@ -9,7 +9,7 @@ option('globhist', type: 'boolean', value: true, description: 'global history su option('mailcap', type: 'boolean', value: true, description: 'mailcap support') option('mimetypes', type: 'boolean', value: true, description: 'mimetypes files support') option('ipv6', type: 'boolean', value: true, description: 'IPv6 support') -option('bittorrent', type: 'boolean', value: false, description: 'BitTorrent protocol support') +option('bittorrent', type: 'boolean', value: true, description: 'BitTorrent protocol support') option('data', type: 'boolean', value: true, description: 'data protocol support') option('uri-rewrite', type: 'boolean', value: true, description: 'URI rewrite support') option('cgi', type: 'boolean', value: false, description: 'local CGI support') @@ -48,7 +48,7 @@ option('zstd', type: 'boolean', value: false, description: 'zstd support') option('idn', type: 'boolean', value: true, description: 'international domain names support') option('lzma', type: 'boolean', value: false, description: 'lzma encoding support') option('gssapi', type: 'boolean', value: false, description: 'GSSAPI support') -option('spidermonkey', type: 'boolean', value: true, description: 'SpiderMonkey Mozilla JavaScript engine support') +option('spidermonkey', type: 'boolean', value: false, description: 'SpiderMonkey Mozilla JavaScript engine support') option('guile', type: 'boolean', value: false, description: 'Guile support') option('perl', type: 'boolean', value: false, description: 'Perl5 support') option('python', type: 'boolean', value: false, description: 'Python3 support')