From: Behdad Esfahbod <behdad@gnome.org>
Date: Mon, 10 Dec 2007 21:41:06 +0000 (+0000)
Subject: Bug 502926 – pango-1.16.4 configure bug: can fail to accept cairo
X-Git-Tag: PANGO_1_19_2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e2f33d6d98d4481548895e4981648dbab283e13f;p=platform%2Fupstream%2Fpango.git

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
---

diff --git a/ChangeLog b/ChangeLog
index db65be0..74e96ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 803bc52..f5dcae1 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)