Merge remote-tracking branch 'origin/tracking' into custom

build/moz.configure/old.configure

@@ -314,6 +314,8 @@ def old_configure_options(*options):
     '--enable-ldap',
     '--enable-mapi',
     '--enable-calendar',
+    '--enable-inspector',
+    '--enable-irc',
     '--enable-incomplete-external-linkage',
     '--enable-mailnews',
     '--enable-mailnews-oauth2',

extensions/spellcheck/hunspell/src/moz.build

@@ -19,11 +19,18 @@ SOURCES += [
 
 DEFINES['BUILDING_LIBHUNSPELL'] = True
 
-SharedLibrary('hunspell')
+# Hunspell must be built into libxul on SunOS. See UXP Issue #2290.
+if CONFIG['OS_TARGET'] == 'SunOS':
 
-USE_LIBS += [
-    'mozglue'
-]
+    FINAL_LIBRARY = 'xul'
+
+else:
+
+    SharedLibrary('hunspell')
+
+    USE_LIBS += [
+       'mozglue'
+    ]
 
 LOCAL_INCLUDES += [
     '../glue',

toolkit/library/moz.build

@@ -196,7 +196,7 @@ if CONFIG['MOZ_SYSTEM_JPEG']:
 
 if CONFIG['MOZ_SYSTEM_HUNSPELL']:
     OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
-else:
+elif CONFIG['OS_TARGET'] != 'SunOS':
     USE_LIBS += [ 'hunspell' ]
 
 if not CONFIG['MOZ_TREE_PIXMAN']: