Werner Lemberg pushed to branch master at FreeType / FreeType
Commits:
-
2b672e72
by Werner Lemberg at 2022-01-02T18:33:03+01:00
3 changed files:
Changes:
| ... | ... | @@ -317,6 +317,12 @@ if test x"$with_zlib" = xyes -a "$have_zlib" = no; then |
| 317 | 317 |
AC_MSG_ERROR([external zlib support requested but library not found])
|
| 318 | 318 |
fi
|
| 319 | 319 |
|
| 320 |
+SYSTEM_ZLIB=
|
|
| 321 |
+if test "$have_zlib" != no; then
|
|
| 322 |
+ SYSTEM_ZLIB=yes
|
|
| 323 |
+fi
|
|
| 324 |
+AC_SUBST([SYSTEM_ZLIB])
|
|
| 325 |
+ |
|
| 320 | 326 |
|
| 321 | 327 |
# check for system libbz2
|
| 322 | 328 |
|
| ... | ... | @@ -219,6 +219,10 @@ FT_BEGIN_HEADER |
| 219 | 219 |
* If you use a build system like cmake or the `configure` script,
|
| 220 | 220 |
* options set by those programs have precedence, overwriting the value
|
| 221 | 221 |
* here with the configured one.
|
| 222 |
+ *
|
|
| 223 |
+ * If you use the GNU make build system directly (that is, without the
|
|
| 224 |
+ * `configure` script) and you define this macro, you also have to pass
|
|
| 225 |
+ * `SYSTEM_ZLIB=yes` as an argument to make.
|
|
| 222 | 226 |
*/
|
| 223 | 227 |
/* #define FT_CONFIG_OPTION_SYSTEM_ZLIB */
|
| 224 | 228 |
|
| ... | ... | @@ -219,6 +219,10 @@ FT_BEGIN_HEADER |
| 219 | 219 |
* If you use a build system like cmake or the `configure` script,
|
| 220 | 220 |
* options set by those programs have precedence, overwriting the value
|
| 221 | 221 |
* here with the configured one.
|
| 222 |
+ *
|
|
| 223 |
+ * If you use the GNU make build system directly (that is, without the
|
|
| 224 |
+ * `configure` script) and you define this macro, you also have to pass
|
|
| 225 |
+ * `SYSTEM_ZLIB=yes` as an argument to make.
|
|
| 222 | 226 |
*/
|
| 223 | 227 |
/* #define FT_CONFIG_OPTION_SYSTEM_ZLIB */
|
| 224 | 228 |
|