diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2007-12-10 21:41:26 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2007-12-10 21:41:26 +0000 |
| commit | a09d957db820530ff97c2c8c525e893d325adbf6 (patch) | |
| tree | 7b12044ee891f992da3ff0ec9e3b3d36b16f9e57 | |
| parent | acf1ca420ff317342db0ee7c365b8dd41b7941c3 (diff) | |
| download | pango-a09d957db820530ff97c2c8c525e893d325adbf6.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=/branches/pango-1-18/; revision=2523
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ +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-11-03 Tor Lillqvist <tml@novell.com> * pango.aliases.win32: New file. Installed as pango.aliases on diff --git a/configure.in b/configure.in index 4b8f0374..4aa7ff82 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) |