2002-12-16 David Turner <david@freetype.org>
* docs/VERSION.DLL: updating document to better explain the differences between
the three version numbers being used on Unix, as well as provide the AutoConf
fragment provided by Lars Clausen
* src/smooth/ftgrays.c (gray_render_conic): fixed small bug that
prevented bezier arcs with negative vertical coordinates to be rendered
appropriately
2002-11-27 Vincent Caron <v.caron@zerodeux.net>
* builds/unix/unix-def.in, builds/unix/freetype-config.in,
builds/unix/configure.ac, src/gzip/rules.mk, src/gzip/ftgzip.c:
adding support for system zlib installations when available on the
target platform (Unix only)
diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac
index a51c941..44baa74 100644
--- a/builds/unix/configure.ac
+++ b/builds/unix/configure.ac
@@ -81,6 +81,23 @@
AC_CHECK_FUNCS(memcpy memmove)
+
+dnl Check for system zlib
+AC_ARG_WITH(zlib,
+ [ --without-zlib use internal zlib instead of system-wide])
+if test x$with_zlib != xno && test -z "$LIBZ"; then
+ AC_CHECK_LIB(z, gzsetparams, [AC_CHECK_HEADER(zlib.h, LIBZ='-lz')])
+fi
+if test x$with_zlib != xno && test -n "$LIBZ"; then
+ CFLAGS="$CFLAGS -DFT_CONFIG_OPTION_SYSTEM_ZLIB"
+ SYSTEM_ZLIB=yes
+fi
+AC_SUBST(LIBZ)
+AC_SUBST(CFLAGS)
+AC_SUBST(SYSTEM_ZLIB)
+
+
+
AC_PROG_LIBTOOL
dnl create the Unix-specific sub-Makefiles `builds/unix/unix-def.mk'
diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in
index 7e939c3..c5a3e5a 100644
--- a/builds/unix/freetype-config.in
+++ b/builds/unix/freetype-config.in
@@ -88,7 +88,7 @@
fi
if test "$echo_libs" = "yes" ; then
- libs="-lfreetype"
+ libs="-lfreetype @LIBZ@"
if test "@libdir@" != "/usr/lib" ; then
echo -L@libdir@ $libs
else
diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in
index 621d068..6797041 100644
--- a/builds/unix/unix-def.in
+++ b/builds/unix/unix-def.in
@@ -85,6 +85,12 @@
LIB_DIR := $(OBJ_DIR)
+# The SYSTEM_ZLIB macro is defined if the user whishes to link dynamically
+# whith its system wide zlib. If SYSTEM_ZLIB is 'yes', the zlib part of the
+# ftgzip module is not compiled in.
+SYSTEM_ZLIB := @SYSTEM_ZLIB@
+
+
# The NO_OUTPUT macro is appended to command lines in order to ignore
# the output of some programs.
#