Commit 19b6b999675815d13afe5a0ce5a8e44f5955ecc8
2002-12-23T22:40:21
* 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
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59
diff --git a/ChangeLog b/ChangeLog
index 2db007b..f92ec2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-12-23 Anthony Fok <anthony@thizlinux.com>
+
+ * 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 <david@freetype.org>
* src/base/ftobjs.c (find_unicode_charmap): added some comments to
diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac
index 44baa74..b9c8fbd 100644
--- a/builds/unix/configure.ac
+++ b/builds/unix/configure.ac
@@ -90,10 +90,12 @@ if test x$with_zlib != xno && test -z "$LIBZ"; then
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)
diff --git a/builds/unix/unix-cc.in b/builds/unix/unix-cc.in
index 7a87396..9de770d 100644
--- a/builds/unix/unix-cc.in
+++ b/builds/unix/unix-cc.in
@@ -78,6 +78,7 @@ LDFLAGS := @LDFLAGS@
# 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
diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in
index 6797041..790bf89 100644
--- a/builds/unix/unix-def.in
+++ b/builds/unix/unix-def.in
@@ -85,8 +85,8 @@ endif
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@