diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-06-14 22:32:32 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-06-14 22:32:32 +0000 |
| commit | 9a5ad21edcde39a7d9be2f7b2eb7b2b1915d4e2f (patch) | |
| tree | b17d624e51e9aae06b2bcd59d3aeb1cbf5710d27 | |
| parent | c321fe33711232a273fa2423da83a9e3b87ed938 (diff) | |
| download | pango-9a5ad21edcde39a7d9be2f7b2eb7b2b1915d4e2f.tar.gz | |
Misc fixes from Stepan Kasal, #169928
2005-06-14 Owen Taylor <otaylor@redhat.com>
Misc fixes from Stepan Kasal, #169928
* pangoxft.pc.in: Add requirement on pangoft2
* pangoxft-uninstalled.pc.in: Fix cut-and-paste
errors in Name/Description when copying from
pangox-uninstalled.
* configure.in: Don't call AC_SUBST() unnecessary
for XFT_CFLAGS/LIBS.
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 13 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | pangoxft-uninstalled.pc.in | 4 | ||||
| -rw-r--r-- | pangoxft.pc.in | 2 |
5 files changed, 29 insertions, 6 deletions
@@ -1,5 +1,18 @@ 2005-06-14 Owen Taylor <otaylor@redhat.com> + Misc fixes from Stepan Kasal, #169928 + + * pangoxft.pc.in: Add requirement on pangoft2 + + * pangoxft-uninstalled.pc.in: Fix cut-and-paste + errors in Name/Description when copying from + pangox-uninstalled. + + * configure.in: Don't call AC_SUBST() unnecessary + for XFT_CFLAGS/LIBS. + +2005-06-14 Owen Taylor <otaylor@redhat.com> + * pango/pango-utils.c (pango_parse_style): Fix some missing case variants in the switch statement. (#169852, Morten Welinder) diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 108ab4d1..ad1447a0 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,5 +1,18 @@ 2005-06-14 Owen Taylor <otaylor@redhat.com> + Misc fixes from Stepan Kasal, #169928 + + * pangoxft.pc.in: Add requirement on pangoft2 + + * pangoxft-uninstalled.pc.in: Fix cut-and-paste + errors in Name/Description when copying from + pangox-uninstalled. + + * configure.in: Don't call AC_SUBST() unnecessary + for XFT_CFLAGS/LIBS. + +2005-06-14 Owen Taylor <otaylor@redhat.com> + * pango/pango-utils.c (pango_parse_style): Fix some missing case variants in the switch statement. (#169852, Morten Welinder) diff --git a/configure.in b/configure.in index b668bc69..07b28b52 100644 --- a/configure.in +++ b/configure.in @@ -237,9 +237,6 @@ if $have_fontconfig ; then if $have_x && $have_freetype ; then PKG_CHECK_MODULES(XFT, xft >= 2.0.0, have_xft=true, :) fi - - AC_SUBST(XFT_LIBS) - AC_SUBST(XFT_CFLAGS) else AC_MSG_WARN([No fontconfig found, skipping tests for FreeType and Xft]) fi diff --git a/pangoxft-uninstalled.pc.in b/pangoxft-uninstalled.pc.in index 14c86f44..97a6bb55 100644 --- a/pangoxft-uninstalled.pc.in +++ b/pangoxft-uninstalled.pc.in @@ -1,5 +1,5 @@ -Name: Pango X Uninstalled -Description: X Window System font support for Pango, Not Installed +Name: Pango Xft Uninstalled +Description: Xft font support for Pango, Not Installed Version: @VERSION@ Requires: pango Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoxft-@PANGO_API_VERSION@.la @XFT_LIBS@ diff --git a/pangoxft.pc.in b/pangoxft.pc.in index 8a1e54a1..46c2183d 100644 --- a/pangoxft.pc.in +++ b/pangoxft.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: Pango Xft Description: Xft font support for Pango Version: @VERSION@ -Requires: pango +Requires: pango pangoft2 Libs: -L${libdir} -lpangoxft-@PANGO_API_VERSION@ @PKGCONFIG_XFT_LIBS@ Cflags: -I${includedir}/pango-1.0 @XFT_CFLAGS@ |