summaryrefslogtreecommitdiffstats
path: root/toolkit/components/startup
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-10-29 22:41:56 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-10-29 22:41:56 +0100
commit2c045d9c55674156b3881efb1cfa9bff41809105 (patch)
tree9aa090992b8a39159f7328e3d5000c8d9564c0f1 /toolkit/components/startup
parent3332144211abfcce21ed43c2ccb3d5cbdd026b64 (diff)
parent5069a375970762f63069a3b750dca817ae5bda2c (diff)
downloadUXP-2c045d9c55674156b3881efb1cfa9bff41809105.tar
UXP-2c045d9c55674156b3881efb1cfa9bff41809105.tar.gz
UXP-2c045d9c55674156b3881efb1cfa9bff41809105.tar.lz
UXP-2c045d9c55674156b3881efb1cfa9bff41809105.tar.xz
UXP-2c045d9c55674156b3881efb1cfa9bff41809105.zip
Merge branch 'master' of https://github.com/MoonchildProductions/UXP
Diffstat (limited to 'toolkit/components/startup')
-rw-r--r--toolkit/components/startup/moz.build21
-rw-r--r--toolkit/components/startup/public/moz.build8
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'