summaryrefslogtreecommitdiffstats
path: root/toolkit/components/startup
diff options
context:
space:
mode:
authorGaming4JC <g4jc@bulletmail.org>2018-10-25 18:12:58 -0400
committerGaming4JC <g4jc@bulletmail.org>2018-10-25 18:12:58 -0400
commit6a2ff38f0fb2ed00e96a1a3d4cd2c655774e87fe (patch)
treeb5ed402996e73e08ebec26e5476a0b3a15c42b3b /toolkit/components/startup
parentb927e0d5caad3a7703829bdc1093bfc67ef3fb97 (diff)
downloadUXP-6a2ff38f0fb2ed00e96a1a3d4cd2c655774e87fe.tar
UXP-6a2ff38f0fb2ed00e96a1a3d4cd2c655774e87fe.tar.gz
UXP-6a2ff38f0fb2ed00e96a1a3d4cd2c655774e87fe.tar.lz
UXP-6a2ff38f0fb2ed00e96a1a3d4cd2c655774e87fe.tar.xz
UXP-6a2ff38f0fb2ed00e96a1a3d4cd2c655774e87fe.zip
Issue #795 - Make nsIUserInfo component optional
This allows the nsIUserinfo component to be disabled with --disable-userinfo in mozconfig at build time, but leaves it on by default to avoid any compatibility issues in existing applications.
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'