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.
This commit is contained in:
parent
1909959973
commit
41d7e4a6ed
|
@ -1,3 +1,11 @@
|
||||||
|
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>
|
2010-01-05 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
||||||
|
|
||||||
* builds/unix/configure.raw: Remove `SYSTEM_BZ2LIB' macro.
|
* builds/unix/configure.raw: Remove `SYSTEM_BZ2LIB' macro.
|
||||||
|
|
|
@ -144,7 +144,7 @@ if test "$echo_libs" = "yes" ; then
|
||||||
if test "$enable_shared" = "yes" ; then
|
if test "$enable_shared" = "yes" ; then
|
||||||
eval "rpath=\"$hardcode_libdir_flag_spec\""
|
eval "rpath=\"$hardcode_libdir_flag_spec\""
|
||||||
fi
|
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
|
if test "${SYSROOT}$libdir" != "/usr/lib" && test "${SYSROOT}$libdir" != "/usr/lib64"; then
|
||||||
echo -L${SYSROOT}$libdir $libs
|
echo -L${SYSROOT}$libdir $libs
|
||||||
else
|
else
|
||||||
|
|
|
@ -8,5 +8,5 @@ Description: A free, high-quality, and portable font engine.
|
||||||
Version: @ft_version@
|
Version: @ft_version@
|
||||||
Requires:
|
Requires:
|
||||||
Libs: -L${libdir} -lfreetype
|
Libs: -L${libdir} -lfreetype
|
||||||
Libs.private: @LIBZ@ @FT2_EXTRA_LIBS@
|
Libs.private: @LIBZ@ @LIBBZ2@ @FT2_EXTRA_LIBS@
|
||||||
Cflags: -I${includedir}/freetype2 -I${includedir}
|
Cflags: -I${includedir}/freetype2 -I${includedir}
|
||||||
|
|
Loading…
Reference in New Issue