Issue #12424: properly disable gjs requirement at build time
This commit is contained in:
@ -1170,11 +1170,9 @@ MIMEtypes += 'image/openraster'
|
|||||||
|
|
||||||
## Javascript
|
## Javascript
|
||||||
|
|
||||||
gjs = find_program('gjs', required: get_option('javascript'))
|
gjs = find_program('gjs', required: false)
|
||||||
have_javascript = get_option('javascript').enabled() or (gjs.found() and get_option('javascript').auto())
|
have_javascript = get_option('javascript').enabled() or (gjs.found() and get_option('javascript').auto())
|
||||||
if not gjs.found() and have_javascript
|
if not gjs.found() and have_javascript
|
||||||
gjs = find_program('gjs', required: false)
|
|
||||||
if not gjs.found()
|
|
||||||
js_warning = '''
|
js_warning = '''
|
||||||
GJS was not found.
|
GJS was not found.
|
||||||
JavaScript plug-ins will be installed anyway but you should make sure that
|
JavaScript plug-ins will be installed anyway but you should make sure that
|
||||||
@ -1184,7 +1182,6 @@ if not gjs.found() and have_javascript
|
|||||||
warning(js_warning)
|
warning(js_warning)
|
||||||
warnings += js_warning
|
warnings += js_warning
|
||||||
endif
|
endif
|
||||||
endif
|
|
||||||
|
|
||||||
## Lua
|
## Lua
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user