diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2009-10-22 17:17:38 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2009-10-22 17:17:38 -0400 |
| commit | 72b3642ec8f689eee5463ae8675323d91496238e (patch) | |
| tree | 99bdf0ded31a193ab26ffca3102d4895c80bbed3 | |
| parent | 8598817414ab8bde6c218c6255faf378597394ea (diff) | |
| download | pango-72b3642ec8f689eee5463ae8675323d91496238e.tar.gz | |
[configure] Allow using uninstalled cairo
Reported by mpsuzuki on gtk-i18n-list on 2009-10-16.
| -rw-r--r-- | configure.in | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 0879b14a..3801fd8f 100644 --- a/configure.in +++ b/configure.in @@ -368,12 +368,10 @@ cairo_required=1.7.6 PKG_CHECK_MODULES(CAIRO, cairo >= $cairo_required, have_cairo=true, AC_MSG_RESULT([no])) if $have_cairo ; then - m4_pattern_allow([PKG_CONFIG_DISABLE_UNINSTALLED]) - INSTALLED_CAIRO_LIBS=`PKG_CONFIG_DISABLE_UNINSTALLED=yes $PKG_CONFIG --libs cairo` pango_save_libs=$LIBS - LIBS="$LIBS $INSTALLED_CAIRO_LIBS" + LIBS="$LIBS $CAIRO_LIBS" pango_save_ldflags=$LDFLAGS - LDFLAGS="$LDFLAGS $INSTALLED_CAIRO_LIBS" + LDFLAGS="$LDFLAGS $CAIRO_LIBS" have_cairo=false cairo_font_backends="" |