diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | pangocairo-uninstalled.pc.in | 2 |
3 files changed, 12 insertions, 2 deletions
@@ -1,5 +1,13 @@ 2006-01-16 Behdad Esfahbod <behdad@gnome.org> + Fixes bug #314675, Brian Cameron. + + * configure.in: Handle uninstalled cairo. + + * pangocairo-uninstalled.pc.in: Fix typo: libpangoxft->libpangocairo. + +2006-01-16 Behdad Esfahbod <behdad@gnome.org> + * modules/indic/mprefixups.c (indic_mprefixups_apply): Remove unused variable clusterSave that was leaking too. (bug #316466, Steve Grubbs) diff --git a/configure.in b/configure.in index 4409a411..9424b63d 100644 --- a/configure.in +++ b/configure.in @@ -287,7 +287,9 @@ PKG_CHECK_MODULES(CAIRO, cairo >= 0.5.2-head, have_cairo=true, :) if $have_cairo ; then pango_save_ldflags=$LDFLAGS - LDFLAGS="$LDFLAGS $CAIRO_LIBS" + m4_pattern_allow([PKG_CONFIG_DISABLE_UNINSTALLED]) + INSTALLED_CAIRO_LIBS=`PKG_CONFIG_DISABLE_UNINSTALLED=yes $PKG_CONFIG --libs cairo` + LDFLAGS="$LDFLAGS $INSTALLED_CAIRO_LIBS" AC_CHECK_LIB(cairo, cairo_win32_scaled_font_select_font, have_cairo_win32=true, :) if $have_cairo_win32 && $have_win32; then AC_DEFINE(HAVE_CAIRO_WIN32, 1, [Whether Cairo uses the Win32 GDI for fonts]) diff --git a/pangocairo-uninstalled.pc.in b/pangocairo-uninstalled.pc.in index 0c5efbce..0f33669c 100644 --- a/pangocairo-uninstalled.pc.in +++ b/pangocairo-uninstalled.pc.in @@ -2,6 +2,6 @@ Name: Pango Cairo Uninstalled Description: Cairo rendering support for Pango, Not Installed Version: @VERSION@ Requires: pango cairo @PKGCONFIG_CAIRO_REQUIRES@ -Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoxft-@PANGO_API_VERSION@.la @PKGCONFIG_CAIRO_LIBS@ +Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangocairo-@PANGO_API_VERSION@.la @PKGCONFIG_CAIRO_LIBS@ Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @CAIRO_CFLAGS@ |