Commit 41d7e4a6ed959e274d63a154bdc31a5b9fa8130d

suzuki toshiya 2011-01-06T02:34:07

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.

diff --git a/ChangeLog b/ChangeLog
index 99292b8..4646d25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 0a7a767..815367b 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 7e948f4..b731800 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}