Skip to content

Commit

Permalink
Bug 1295784 - Use the argument name for when when passing it to Pyt…
Browse files Browse the repository at this point in the history
…hon configure's pkg_check_modules. r=glandium

MozReview-Commit-ID: GcVEzS3nLql
  • Loading branch information
chmanchester committed Aug 17, 2016
1 parent 7d9c80e commit 4cdee25
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion build/moz.configure/ffi.configure
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ js_option('--with-system-ffi',

use_system_ffi = depends_if('--with-system-ffi')(lambda _: True)

system_ffi = pkg_check_modules('MOZ_FFI', 'libffi > 3.0.9', use_system_ffi)
system_ffi = pkg_check_modules('MOZ_FFI', 'libffi > 3.0.9',
when=use_system_ffi)

set_config('MOZ_SYSTEM_FFI', system_ffi)
add_old_configure_assignment('MOZ_SYSTEM_FFI', system_ffi)
Expand Down
2 changes: 1 addition & 1 deletion moz.configure
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ def check_for_hunspell(value, compile_env):
return value and compile_env

system_hunspell = pkg_check_modules('MOZ_HUNSPELL', 'hunspell',
check_for_hunspell)
when=check_for_hunspell)

set_config('MOZ_SYSTEM_HUNSPELL', system_hunspell)

Expand Down
3 changes: 2 additions & 1 deletion toolkit/moz.configure
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,8 @@ option('--enable-gpsd', env='MOZ_GPSD',
def gpsd(value):
return bool(value)

system_gpsd = pkg_check_modules('MOZ_GPSD', 'libgps >= 3.11', gpsd)
system_gpsd = pkg_check_modules('MOZ_GPSD', 'libgps >= 3.11',
when=gpsd)

set_config('MOZ_GPSD', system_gpsd)

Expand Down

0 comments on commit 4cdee25

Please sign in to comment.