diff options
| author | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2011-01-06 02:34:07 +0900 |
|---|---|---|
| committer | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2011-01-06 02:36:50 +0900 |
| commit | 41d7e4a6ed959e274d63a154bdc31a5b9fa8130d (patch) | |
| tree | 5ec1d5a30d9037c7f6c67e418c58eb2e99d43d7b | |
| parent | 1909959973585c9f827683dfc33391d4654c37eb (diff) | |
| download | freetype2-41d7e4a6ed959e274d63a154bdc31a5b9fa8130d.tar.gz | |
Update pkg-config tools to reflect Bzip2 support.
* builds/unix/freetype-config.in: Include `-lbz2' to
--libs output, if built with Bzip2 support.
* builds/unix/freetype2.in: Ditto.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | builds/unix/freetype-config.in | 2 | ||||
| -rw-r--r-- | builds/unix/freetype2.in | 2 |
3 files changed, 10 insertions, 2 deletions
@@ -1,5 +1,13 @@ 2010-01-05 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> + Update pkg-config tools to reflect Bzip2 support. + + * builds/unix/freetype-config.in: Include `-lbz2' to + --libs output, if built with Bzip2 support. + * builds/unix/freetype2.in: Ditto. + +2010-01-05 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> + * builds/unix/configure.raw: Remove `SYSTEM_BZ2LIB' macro. SYSTEM_ZLIB is used to switch the builtin zlib source diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in index 0a7a767d6..815367ba8 100644 --- a/builds/unix/freetype-config.in +++ b/builds/unix/freetype-config.in @@ -144,7 +144,7 @@ if test "$echo_libs" = "yes" ; then if test "$enable_shared" = "yes" ; then eval "rpath=\"$hardcode_libdir_flag_spec\"" fi - libs="-lfreetype @LIBZ@ @FT2_EXTRA_LIBS@" + libs="-lfreetype @LIBZ@ @LIBBZ2@ @FT2_EXTRA_LIBS@" if test "${SYSROOT}$libdir" != "/usr/lib" && test "${SYSROOT}$libdir" != "/usr/lib64"; then echo -L${SYSROOT}$libdir $libs else diff --git a/builds/unix/freetype2.in b/builds/unix/freetype2.in index 7e948f437..b73180049 100644 --- a/builds/unix/freetype2.in +++ b/builds/unix/freetype2.in @@ -8,5 +8,5 @@ Description: A free, high-quality, and portable font engine. Version: @ft_version@ Requires: Libs: -L${libdir} -lfreetype -Libs.private: @LIBZ@ @FT2_EXTRA_LIBS@ +Libs.private: @LIBZ@ @LIBBZ2@ @FT2_EXTRA_LIBS@ Cflags: -I${includedir}/freetype2 -I${includedir} |