diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-10-26 09:04:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-26 09:04:16 +0200 |
| commit | 4f59678acd9b48284b6b23b3d6863a33739dfdff (patch) | |
| tree | 92d5ed317cd80b4b72a6374347ad1d120d3912d1 /toolkit/components/startup | |
| parent | f5b13e91d18a414dae5e384b377ead66bc8d898f (diff) | |
| parent | 6a2ff38f0fb2ed00e96a1a3d4cd2c655774e87fe (diff) | |
| download | UXP-4f59678acd9b48284b6b23b3d6863a33739dfdff.tar UXP-4f59678acd9b48284b6b23b3d6863a33739dfdff.tar.gz UXP-4f59678acd9b48284b6b23b3d6863a33739dfdff.tar.lz UXP-4f59678acd9b48284b6b23b3d6863a33739dfdff.tar.xz UXP-4f59678acd9b48284b6b23b3d6863a33739dfdff.zip | |
Merge pull request #854 from g4jc/nsuserinfo
Issue #795 - Make nsIUserInfo component optional
Diffstat (limited to 'toolkit/components/startup')
| -rw-r--r-- | toolkit/components/startup/moz.build | 21 | ||||
| -rw-r--r-- | toolkit/components/startup/public/moz.build | 8 |
2 files changed, 12 insertions, 17 deletions
diff --git a/toolkit/components/startup/moz.build b/toolkit/components/startup/moz.build index dbd580384..5f290b783 100644 --- a/toolkit/components/startup/moz.build +++ b/toolkit/components/startup/moz.build @@ -18,19 +18,14 @@ UNIFIED_SOURCES += [ 'StartupTimeline.cpp', ] -if CONFIG['OS_ARCH'] == 'WINNT': - # This file cannot be built in unified mode because of name clashes with Windows headers. - SOURCES += [ - 'nsUserInfoWin.cpp', - ] -elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': - UNIFIED_SOURCES += [ - 'nsUserInfoMac.mm', - ] -else: - UNIFIED_SOURCES += [ - 'nsUserInfoUnix.cpp', - ] +if CONFIG['MOZ_USERINFO']: + if CONFIG['OS_ARCH'] == 'WINNT': + # This file cannot be built in unified mode because of name clashes with Windows headers. + SOURCES += ['nsUserInfoWin.cpp'] + elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': + UNIFIED_SOURCES += ['nsUserInfoMac.mm'] + else: + UNIFIED_SOURCES += ['nsUserInfoUnix.cpp'] FINAL_LIBRARY = 'xul' diff --git a/toolkit/components/startup/public/moz.build b/toolkit/components/startup/public/moz.build index 5894b6c51..948a7d7ee 100644 --- a/toolkit/components/startup/public/moz.build +++ b/toolkit/components/startup/public/moz.build @@ -4,10 +4,10 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -XPIDL_SOURCES += [ - 'nsIAppStartup.idl', - 'nsIUserInfo.idl', -] +XPIDL_SOURCES += ['nsIAppStartup.idl'] + +if CONFIG['MOZ_USERINFO']: + XPIDL_SOURCES += ['nsIUserInfo.idl'] XPIDL_MODULE = 'appstartup' |