Commit 1fae66950b4fec4dabc2a45d11fda3466d6ac687

Werner Lemberg 2006-02-17T16:16:40

* devel/ftoption.h: Synchronize with include/freetype/config/ftoption.h.

diff --git a/ChangeLog b/ChangeLog
index 797efdf..74e8fd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-17  Werner Lemberg  <wl@gnu.org>
+
+	* devel/ftoption.h: Synchronize with
+	include/freetype/config/ftoption.h.
+
 2006-02-16  David Turner  <david@freetype.org>
 
 	Massive changes to the internals to respect the internal object
diff --git a/devel/ftoption.h b/devel/ftoption.h
index 3e0efe2..d3f0495 100644
--- a/devel/ftoption.h
+++ b/devel/ftoption.h
@@ -556,13 +556,29 @@ FT_BEGIN_HEADER
 #undef T1_CONFIG_OPTION_NO_MM_SUPPORT
 
 
- /* */
+  /*************************************************************************/
+  /*************************************************************************/
+  /****                                                                 ****/
+  /****    A U T O F I T   M O D U L E    C O N F I G U R A T I O N     ****/
+  /****                                                                 ****/
+  /*************************************************************************/
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* Compile autofit module with CJK script support.                       */
+  /*                                                                       */
+#define AF_CONFIG_OPTION_CJK
+
+
+  /* */
 
   /*
    * This temporary macro is used to control various optimizations for
    * reducing the heap footprint of memory-mapped TrueType files.
    */
-#define  FT_OPTIMIZE_MEMORY
+#define FT_OPTIMIZE_MEMORY
 
 
   /*
@@ -571,7 +587,16 @@ FT_BEGIN_HEADER
    * releases from emitting zillions of `strict aliasing' warning messages
    * each time a memory-management function is called.
    */
-#define  FT_STRICT_ALIASING
+#define FT_STRICT_ALIASING
+
+
+  /*
+   * Define this variable if you want to keep the layout of internal
+   * structures that was used prior to FreeType 2.2.  This also compiles in
+   * a few obsolete functions to avoid linking problems on typical Unix
+   * distributions.
+   */
+#undef FT_CONFIG_OPTION_OLD_INTERNALS
 
 
 FT_END_HEADER