Fix handling of `AF_CONFIG_OPTION_INDIC'.

* devel/ftoption.h, include/freetype/config/ftoption.h: `AF_CONFIG_OPTION_INDIC' needs `AF_CONFIG_OPTION_CJK'.
5 years ago · 87f5225256
parent 12351eeefa
commit 87f5225256
3 changed files with 13 additions and 2 deletions
--- a/7
+++ b/7
@ -1,3 +1,10 @@
+2019-09-05  Werner Lemberg  <wl@gnu.org>
+
+	Fix handling of `AF_CONFIG_OPTION_INDIC'.
+
+	* devel/ftoption.h, include/freetype/config/ftoption.h:
+	`AF_CONFIG_OPTION_INDIC' needs `AF_CONFIG_OPTION_CJK'.
+
 2019-09-05  Werner Lemberg  <wl@gnu.org>

 	CMakeLists.txt: Fix generation of DLL related stuff (#56852).
--- a/devel/ftoption.h
+++ b/devel/ftoption.h
@ -887,9 +887,11 @@ FT_BEGIN_HEADER
   *
   * Compile 'autofit' module with fallback Indic script support, covering
   * some scripts that the 'latin' submodule of the 'autofit' module doesn't
-   * (yet) handle.
+   * (yet) handle.  Currently, this needs option `AF_CONFIG_OPTION_CJK`.
   */
+#ifdef AF_CONFIG_OPTION_CJK
 #define AF_CONFIG_OPTION_INDIC
+#endif


  /**************************************************************************
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@ -887,9 +887,11 @@ FT_BEGIN_HEADER
   *
   * Compile 'autofit' module with fallback Indic script support, covering
   * some scripts that the 'latin' submodule of the 'autofit' module doesn't
-   * (yet) handle.
+   * (yet) handle.  Currently, this needs option `AF_CONFIG_OPTION_CJK`.
   */
+#ifdef AF_CONFIG_OPTION_CJK
 #define AF_CONFIG_OPTION_INDIC
+#endif


  /**************************************************************************