rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* 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
This commit is contained in:
David Turner 2002-12-23 22:40:21 +00:00
parent caf4be3cd1
commit 19b6b99967
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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

2
builds/unix/configure.ac
View File

@ -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)

3
builds/unix/unix-cc.in
View File

@ -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

4
builds/unix/unix-def.in
View File

@ -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@