Commit 87f5225256969e59dec7ea64c96067776d8a2f2d
2019-09-05T12:14:03
Fix handling of `AF_CONFIG_OPTION_INDIC'. * devel/ftoption.h, include/freetype/config/ftoption.h: `AF_CONFIG_OPTION_INDIC' needs `AF_CONFIG_OPTION_CJK'.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51
diff --git a/ChangeLog b/ChangeLog
index 8ca572d..5298252 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
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).
Extract `version_info' variable from `builds/unix/configure.raw' and
diff --git a/devel/ftoption.h b/devel/ftoption.h
index ef8d5e5..1e2329d 100644
--- 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
/**************************************************************************
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index c3fd181..721e2c9 100644
--- 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
/**************************************************************************