ref: 19b6b999675815d13afe5a0ce5a8e44f5955ecc8
parent: caf4be3cd12c0dd2736097957e7d03555939a6ce
author: David Turner <[email protected]>
date: Mon Dec 23 17:40:21 EST 2002
* builds/unix/configure.ac, builds/unix/unix-cc.in,
builds/unix/unix-def.in: small fix to configure sub-system on Unix
to allow other programs to correctly link with zlib when needed
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-12-23 Anthony Fok <[email protected]>
+
+ * builds/unix/configure.ac, builds/unix/unix-cc.in,
+ builds/unix/unix-def.in: small fix to configure sub-system on Unix
+ to allow other programs to correctly link with zlib when needed
+
2002-12-17 David Turner <[email protected]>
* src/base/ftobjs.c (find_unicode_charmap): added some comments to
--- a/builds/unix/configure.ac
+++ b/builds/unix/configure.ac
@@ -90,10 +90,12 @@
fi
if test x$with_zlib != xno && test -n "$LIBZ"; then
CFLAGS="$CFLAGS -DFT_CONFIG_OPTION_SYSTEM_ZLIB"
+ LDFLAGS="$LDFLAGS $LIBZ"
SYSTEM_ZLIB=yes
fi
AC_SUBST(LIBZ)
AC_SUBST(CFLAGS)
+AC_SUBST(LDFLAGS)
AC_SUBST(SYSTEM_ZLIB)
--- a/builds/unix/unix-cc.in
+++ b/builds/unix/unix-cc.in
@@ -78,6 +78,7 @@
# Library linking
#
LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
- -rpath $(libdir) -version-info $(version_info)
+ -rpath $(libdir) -version-info $(version_info) \
+ $(LDFLAGS)
# EOF
--- a/builds/unix/unix-def.in
+++ b/builds/unix/unix-def.in
@@ -85,8 +85,8 @@
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
+# The SYSTEM_ZLIB macro is defined if the user wishes to link dynamically
+# with its system wide zlib. If SYSTEM_ZLIB is 'yes', the zlib part of the
# ftgzip module is not compiled in.
SYSTEM_ZLIB := @SYSTEM_ZLIB@