forked from minhngoc25a/freetype2
* 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:
parent
caf4be3cd1
commit
19b6b99967
|
@ -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>
|
2002-12-17 David Turner <david@freetype.org>
|
||||||
|
|
||||||
* src/base/ftobjs.c (find_unicode_charmap): added some comments to
|
* src/base/ftobjs.c (find_unicode_charmap): added some comments to
|
||||||
|
|
|
@ -90,10 +90,12 @@ if test x$with_zlib != xno && test -z "$LIBZ"; then
|
||||||
fi
|
fi
|
||||||
if test x$with_zlib != xno && test -n "$LIBZ"; then
|
if test x$with_zlib != xno && test -n "$LIBZ"; then
|
||||||
CFLAGS="$CFLAGS -DFT_CONFIG_OPTION_SYSTEM_ZLIB"
|
CFLAGS="$CFLAGS -DFT_CONFIG_OPTION_SYSTEM_ZLIB"
|
||||||
|
LDFLAGS="$LDFLAGS $LIBZ"
|
||||||
SYSTEM_ZLIB=yes
|
SYSTEM_ZLIB=yes
|
||||||
fi
|
fi
|
||||||
AC_SUBST(LIBZ)
|
AC_SUBST(LIBZ)
|
||||||
AC_SUBST(CFLAGS)
|
AC_SUBST(CFLAGS)
|
||||||
|
AC_SUBST(LDFLAGS)
|
||||||
AC_SUBST(SYSTEM_ZLIB)
|
AC_SUBST(SYSTEM_ZLIB)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -78,6 +78,7 @@ LDFLAGS := @LDFLAGS@
|
||||||
# Library linking
|
# Library linking
|
||||||
#
|
#
|
||||||
LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
|
LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
|
||||||
-rpath $(libdir) -version-info $(version_info)
|
-rpath $(libdir) -version-info $(version_info) \
|
||||||
|
$(LDFLAGS)
|
||||||
|
|
||||||
# EOF
|
# EOF
|
||||||
|
|
|
@ -85,8 +85,8 @@ endif
|
||||||
LIB_DIR := $(OBJ_DIR)
|
LIB_DIR := $(OBJ_DIR)
|
||||||
|
|
||||||
|
|
||||||
# The SYSTEM_ZLIB macro is defined if the user whishes to link dynamically
|
# The SYSTEM_ZLIB macro is defined if the user wishes to link dynamically
|
||||||
# whith its system wide zlib. If SYSTEM_ZLIB is 'yes', the zlib part of the
|
# with its system wide zlib. If SYSTEM_ZLIB is 'yes', the zlib part of the
|
||||||
# ftgzip module is not compiled in.
|
# ftgzip module is not compiled in.
|
||||||
SYSTEM_ZLIB := @SYSTEM_ZLIB@
|
SYSTEM_ZLIB := @SYSTEM_ZLIB@
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue