Index: builds/unix/.cvsignore =================================================================== RCS file: /cvs/freetype/freetype2/builds/unix/.cvsignore,v retrieving revision 1.2 diff -u -p -r1.2 .cvsignore --- .cvsignore 2000/11/11 05:55:41 1.2 +++ .cvsignore 2002/11/11 13:50:57 @@ -6,3 +6,4 @@ config.log libtool ftconfig.h freetype-config +autom4te.cache Index: builds/unix/configure.ac =================================================================== RCS file: /cvs/freetype/freetype2/builds/unix/configure.ac,v retrieving revision 1.8 diff -u -p -r1.8 configure.ac --- configure.ac 2002/09/10 15:17:32 1.8 +++ configure.ac 2002/11/11 13:50:57 @@ -81,6 +81,20 @@ AC_SUBST(FTSYS_SRC) 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" +fi +AC_SUBST(LIBZ) +AC_SUBST(CFLAGS) + + AC_PROG_LIBTOOL dnl create the Unix-specific sub-Makefiles `builds/unix/unix-def.mk' Index: builds/unix/freetype-config.in =================================================================== RCS file: /cvs/freetype/freetype2/builds/unix/freetype-config.in,v retrieving revision 1.10 diff -u -p -r1.10 freetype-config.in --- freetype-config.in 2002/02/02 15:05:38 1.10 +++ freetype-config.in 2002/11/11 13:50:57 @@ -88,7 +88,7 @@ if test "$echo_cflags" = "yes" ; then fi if test "$echo_libs" = "yes" ; then - libs="-lfreetype" + libs="-lfreetype @LIBZ@" if test "@libdir@" != "/usr/lib" ; then echo address@hidden@ $libs else