[pango] [configure] Allow using uninstalled cairo



commit 72b3642ec8f689eee5463ae8675323d91496238e
Author: Behdad Esfahbod <behdad behdad org>
Date:   Thu Oct 22 17:17:38 2009 -0400

    [configure] Allow using uninstalled cairo
    
    Reported by mpsuzuki on gtk-i18n-list on 2009-10-16.

 configure.in |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/configure.in b/configure.in
index 0879b14..3801fd8 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=""



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]