ref: 2b672e7210a6e989aca4787fb81f4b2542bad9c1
parent: 4eb6cb8818057a022f97176b53738ee3098c8eb6
author: Werner Lemberg <wl@gnu.org>
date: Sun Jan 2 13:33:03 EST 2022
* builds/unix/configure.raw: Restore `SYSTEM_ZLIB` variable. This was accidentally removed with commit 93ebcbd0 almost eight years ago.
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@@ -317,6 +317,12 @@
AC_MSG_ERROR([external zlib support requested but library not found])
fi
+SYSTEM_ZLIB=
+if test "$have_zlib" != no; then
+ SYSTEM_ZLIB=yes
+fi
+AC_SUBST([SYSTEM_ZLIB])
+
# check for system libbz2
--- a/devel/ftoption.h
+++ b/devel/ftoption.h
@@ -219,6 +219,10 @@
* If you use a build system like cmake or the `configure` script,
* options set by those programs have precedence, overwriting the value
* here with the configured one.
+ *
+ * If you use the GNU make build system directly (that is, without the
+ * `configure` script) and you define this macro, you also have to pass
+ * `SYSTEM_ZLIB=yes` as an argument to make.
*/
/* #define FT_CONFIG_OPTION_SYSTEM_ZLIB */
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -219,6 +219,10 @@
* If you use a build system like cmake or the `configure` script,
* options set by those programs have precedence, overwriting the value
* here with the configured one.
+ *
+ * If you use the GNU make build system directly (that is, without the
+ * `configure` script) and you define this macro, you also have to pass
+ * `SYSTEM_ZLIB=yes` as an argument to make.
*/
/* #define FT_CONFIG_OPTION_SYSTEM_ZLIB */