diff options
| author | Werner Lemberg <wl@gnu.org> | 2019-09-05 12:14:03 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2019-09-05 12:14:03 +0200 |
| commit | 87f5225256969e59dec7ea64c96067776d8a2f2d (patch) | |
| tree | b8e49673b331f1757b13409642afb6c617edcaaf | |
| parent | 12351eeefa677de3dee4c3a3c9c91ba3b5fb6855 (diff) | |
| download | freetype2-87f5225256969e59dec7ea64c96067776d8a2f2d.tar.gz | |
Fix handling of `AF_CONFIG_OPTION_INDIC'.
* devel/ftoption.h, include/freetype/config/ftoption.h:
`AF_CONFIG_OPTION_INDIC' needs `AF_CONFIG_OPTION_CJK'.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | devel/ftoption.h | 4 | ||||
| -rw-r--r-- | include/freetype/config/ftoption.h | 4 |
3 files changed, 13 insertions, 2 deletions
@@ -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 ef8d5e56f..1e2329d71 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 c3fd181ff..721e2c9b1 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 /************************************************************************** |