diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2007-12-11 00:14:54 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2007-12-11 00:14:54 +0000 |
| commit | 2bebef69fd262fab95abdd076173a3364eb6b04b (patch) | |
| tree | 903a9392a354ebd057209981c00758c2f1cc8926 | |
| parent | e2f33d6d98d4481548895e4981648dbab283e13f (diff) | |
| download | pango-2bebef69fd262fab95abdd076173a3364eb6b04b.tar.gz | |
Better fix: set both LIBS and LDFLAGS.
2007-12-10 Behdad Esfahbod <behdad@gnome.org>
* configure.in: Better fix: set both LIBS and LDFLAGS.
svn path=/trunk/; revision=2524
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 7 |
2 files changed, 9 insertions, 2 deletions
@@ -1,5 +1,9 @@ 2007-12-10 Behdad Esfahbod <behdad@gnome.org> + * configure.in: Better fix: set both LIBS and LDFLAGS. + +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. diff --git a/configure.in b/configure.in index f5dcae10..52700291 100644 --- a/configure.in +++ b/configure.in @@ -337,10 +337,12 @@ 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_libs=$LIBS m4_pattern_allow([PKG_CONFIG_DISABLE_UNINSTALLED]) INSTALLED_CAIRO_LIBS=`PKG_CONFIG_DISABLE_UNINSTALLED=yes $PKG_CONFIG --libs cairo` - LIBS="$LDFLAGS $INSTALLED_CAIRO_LIBS" + pango_save_libs=$LIBS + LIBS="$LIBS $INSTALLED_CAIRO_LIBS" + pango_save_ldflags=$LDFLAGS + LDFLAGS="$LDFLAGS $INSTALLED_CAIRO_LIBS" AC_CHECK_LIB(cairo, cairo_surface_write_to_png, have_cairo_png=true, :) @@ -388,6 +390,7 @@ if $have_cairo ; then fi LIBS=$pango_save_libs + LDFLAGS=$pango_save_ldflags fi AM_CONDITIONAL(HAVE_CAIRO, $have_cairo) |