Issue #1451 - Split hunspell library out of xul.

utf_info.cxx imported from 1.4.1 upstream.

Also moved unicode_info struct to the header to fix bustage with compiling the
new utf_info.cxx.

I've also gone ahead and deunified this new shared library as unified building
is busting in hunspell.cxx, complaining about config.h not being found. Weird
that it only happens in unified mode.

This reduces libxul size on all platforms by ~200 KB.

extensions/spellcheck/hunspell/glue/moz.build

@@ -33,6 +33,4 @@ EXPORTS.mozilla += [
      'RemoteSpellCheckEngineParent.h',
 ]
 
-# This variable is referenced in configure.in.  Make sure to change that file
-# too if you need to change this variable.
-DEFINES['HUNSPELL_STATIC'] = True
+DEFINES['BUILDING_LIBHUNSPELL'] = True

extensions/spellcheck/hunspell/src/csutil.cxx

@@ -81,13 +81,6 @@
 #include "atypes.hxx"
 #include "langnum.hxx"
 
-// Unicode character encoding information
-struct unicode_info {
-  unsigned short c;
-  unsigned short cupper;
-  unsigned short clower;
-};
-
 #ifdef _WIN32
 #include <windows.h>
 #include <wchar.h>

extensions/spellcheck/hunspell/src/csutil.hxx

@@ -74,6 +74,9 @@
 #ifndef __CSUTILHXX__
 #define __CSUTILHXX__
 
+// Quick hack to make building hunspell as a shared library work.
+#undef MOZILLA_CLIENT
+
 #include "hunvisapi.h"
 
 // First some base level utility routines
@@ -190,6 +193,13 @@ struct cs_info {
   unsigned char cupper;
 };
 
+// Unicode character encoding information
+struct unicode_info {
+  unsigned short c;
+  unsigned short cupper;
+  unsigned short clower;
+};
+
 LIBHUNSPELL_DLL_EXPORTED int initialize_utf_tbl();
 LIBHUNSPELL_DLL_EXPORTED void free_utf_tbl();
 LIBHUNSPELL_DLL_EXPORTED unsigned short unicodetoupper(unsigned short c,

extensions/spellcheck/hunspell/src/moz.build

@@ -3,7 +3,7 @@
 # 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/.
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'affentry.cxx',
     'affixmgr.cxx',
     'csutil.cxx',
@@ -14,13 +14,16 @@ UNIFIED_SOURCES += [
     'phonet.cxx',
     'replist.cxx',
     'suggestmgr.cxx',
+    'utf_info.cxx',
 ]
 
-# This variable is referenced in configure.in.  Make sure to change that file
-# too if you need to change this variable.
-DEFINES['HUNSPELL_STATIC'] = True
+DEFINES['BUILDING_LIBHUNSPELL'] = True
 
-FINAL_LIBRARY = 'xul'
+SharedLibrary('hunspell')
+
+USE_LIBS += [
+    'mozglue'
+]
 
 LOCAL_INCLUDES += [
     '../glue',

toolkit/library/moz.build

@@ -196,6 +196,8 @@ if CONFIG['MOZ_SYSTEM_JPEG']:
 
 if CONFIG['MOZ_SYSTEM_HUNSPELL']:
     OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
+else:
+    USE_LIBS += [ 'hunspell' ]
 
 if not CONFIG['MOZ_TREE_PIXMAN']:
     OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']