diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2007-12-10 21:41:06 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2007-12-10 21:41:06 +0000 |
| commit | e2f33d6d98d4481548895e4981648dbab283e13f (patch) | |
| tree | 35b033fe6b8ea2ce0b49975080e55687ef66dbfa | |
| parent | ed0d24ca568e4201545fdc79706554de1d41c404 (diff) | |
| download | pango-e2f33d6d98d4481548895e4981648dbab283e13f.tar.gz | |
Bug 502926 – pango-1.16.4 configure bug: can fail to accept cairo
2007-12-10 Behdad Esfahbod <behdad@gnome.org>
Bug 502926 – pango-1.16.4 configure bug: can fail to accept cairo
* configure.in: Fix cairo library checking.
svn path=/trunk/; revision=2522
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -1,5 +1,11 @@ 2007-12-10 Behdad Esfahbod <behdad@gnome.org> + Bug 502926 – pango-1.16.4 configure bug: can fail to accept cairo + + * configure.in: Fix cairo library checking. + +2007-12-10 Behdad Esfahbod <behdad@gnome.org> + * pango/pangocairo-fontmap.c: Improve pango_cairo_font_map_get_default() docs. diff --git a/configure.in b/configure.in index 803bc525..f5dcae10 100644 --- a/configure.in +++ b/configure.in @@ -337,10 +337,10 @@ have_cairo_atsui=false PKG_CHECK_MODULES(CAIRO, cairo >= 1.2.6, have_cairo=true, AC_MSG_RESULT([no])) if $have_cairo ; then - pango_save_ldflags=$LDFLAGS + pango_save_libs=$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" + LIBS="$LDFLAGS $INSTALLED_CAIRO_LIBS" AC_CHECK_LIB(cairo, cairo_surface_write_to_png, have_cairo_png=true, :) @@ -387,7 +387,7 @@ if $have_cairo ; then AC_DEFINE(HAVE_CAIRO, 1, [Have usable Cairo library and font backend]) fi - LDFLAGS=$pango_save_ldflags + LIBS=$pango_save_libs fi AM_CONDITIONAL(HAVE_CAIRO, $have_cairo) |